X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=client;h=afdee9dcb7e7c8a8e2f72cfbd1f610687c1a29a9;hp=4e0bb70c9a50c2617b4ad791fb7386c0f8f96966;hb=a4e03162bd84efc04c28d081ccf2c89f4efa796e;hpb=c0c90673b8858c021e95453ce017397db5242c75

diff --git a/client b/client
index 4e0bb70..afdee9d 100755
--- a/client
+++ b/client
@@ -28,13 +28,14 @@ def process_cfg():
     c.url = cfg.get('server','url')
   except NoOptionError:
     process_cfg_saddrs()
-    sa = c.saddrs[0].url()
+    c.url = c.saddrs[0].url()
 
   process_cfg_clients(set_client)
 
   c.routes = cfg.get('virtual','routes')
   c.max_queue_time = cfg.getint(client_cs, 'max_queue_time')
   c.max_batch_up   = cfg.getint(client_cs, 'max_batch_up')
+  c.http_timeout   = cfg.getint(client_cs, 'http_timeout')
 
   process_cfg_ipif(client_cs,
                    (('local', 'client'),
@@ -72,27 +73,28 @@ def req_ok(resp):
 def req_err(err):
   print(err, file=sys.stderr)
 
-def req_fin(*args):  
+def req_fin(*args):
+  global outstanding
   outstanding -= 1
 
 def check_outbound():
+  global outstanding
   while True:
     if                          outstanding >= c.max_outstanding   : break
     if not queue.nonempty() and outstanding >= c.target_outstanding: break
 
     d = b''
-    def moredata(s): global d; d += s
+    def moredata(s): nonlocal d; d += s
     queue.process((lambda: len(d)),
                   moredata,
                   c.max_batch_up)
-    assert(len(d))
     
     crlf = b'\r\n'
     mime = (b'--b'                                      + crlf +
             b'Content-Disposition: form-data; name="m"' + crlf +
             password                                    + crlf +
-            c.client                                    + crlf +
-            c.target_outstanding                        + crlf +
+            str(c.client)             .encode('ascii')  + crlf +
+            str(c.target_outstanding) .encode('ascii')  + crlf +
             b'--b'                                      + crlf +
             b'Content-Disposition: form-data; name="d"' + crlf +
             mime_translate(d)                           + crlf +
@@ -103,7 +105,7 @@ def check_outbound():
     req = agent.request(b'POST',
                         c.url,
                         twisted.web.client.Headers(hh))
-    req.addTimeout(c.http_timeout)
+    req.addTimeout(c.http_timeout, reactor)
     req.addCallbacks(req_ok, req_err)
     req.addBoth(req_fin)
     outstanding += 1