[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15267 - in gauger: . web
From: |
gnunet |
Subject: |
[GNUnet-SVN] r15267 - in gauger: . web |
Date: |
Fri, 20 May 2011 00:17:12 +0200 |
Author: bartpolot
Date: 2011-05-20 00:17:12 +0200 (Fri, 20 May 2011)
New Revision: 15267
Modified:
gauger/gauger-cli.py
gauger/web/io.php
Log:
Changed client to HTTP, fixed empty range bug
Modified: gauger/gauger-cli.py
===================================================================
--- gauger/gauger-cli.py 2011-05-19 13:34:47 UTC (rev 15266)
+++ gauger/gauger-cli.py 2011-05-19 22:17:12 UTC (rev 15267)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
"""gauger-cli.py
This file is part of gauger.
@@ -22,10 +22,10 @@
Gauger client.
"""
-import socket
import sys
import os
import subprocess
+import urllib
if(sys.version_info[0] == 2 and sys.version_info[1] < 7):
import ap27 as arg_parser
@@ -67,14 +67,14 @@
try:
configfile = open("gauger-cli.conf", "r")
- remotehost, username, password = configfile.readline().strip().split()
+ remoteurl, username, password = configfile.readline().strip().split()
except:
try:
homefilename = os.path.join(os.path.expanduser('~'), ".gauger-cli.conf")
configfile = open(homefilename, "r")
- remotehost, username, password = configfile.readline().strip().split()
+ remoteurl, username, password = configfile.readline().strip().split()
except:
- print >> sys.stderr, "please put 'remotehost username password' in
gauger-cli.conf"
+ print >> sys.stderr, "please put 'remoteurl username password' in
gauger-cli.conf"
exit(1)
if(args.check):
@@ -104,20 +104,14 @@
if(args.category):
args.name = args.category + ":::" + args.name
-port = 10111
-if (remotehost.count(':') == 1):
- remotehost,port = remotehost.split(':')
- port = int(port)
-if (args.port != None):
- port = args.port
-
-s1 = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+l1 = {'user': username, 'pass': password, 'revision': revision, 'name':
args.name, 'value': args.data}
try:
- s1.connect((remotehost, port))
+ f = urllib.urlopen(remoteurl, urllib.urlencode(l1))
except:
- print >> sys.stderr, "Couldn't connect to", remotehost
- exit(1)
-l1 = [username, password, revision]
-l1.append(args.name);
-l1.append(args.data);
-s1.send(",".join(l1))
+ print >> sys.stderr, "Could not connect to", remoteurl
+ exit(1)
+try:
+ print f.read()
+except:
+ print ""
+f.close()
Modified: gauger/web/io.php
===================================================================
--- gauger/web/io.php 2011-05-19 13:34:47 UTC (rev 15266)
+++ gauger/web/io.php 2011-05-19 22:17:12 UTC (rev 15267)
@@ -83,10 +83,15 @@
if($f === false) return;
flock($f, LOCK_EX);
$range = explode(' ', fgets($f, 512));
- $range[0] = min($range[0], $data);
- $range[1] = max($range[1], $data);
+ if(count($range) < 2) {
+ $range[0] = $data;
+ $range[1] = $data;
+ } else {
+ $range[0] = min($range[0], $data);
+ $range[1] = max($range[1], $data);
+ }
fseek($f, 0, SEEK_SET);
- fwrite($f, implode(' ', $data));
+ fwrite($f, implode(' ', $range));
ftruncate($f, ftell($f));
flock($f, LOCK_UN);
fclose($f);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15267 - in gauger: . web,
gnunet <=