chiark / gitweb /
wip, towards target
[hippotat.git] / client
diff --git a/client b/client
index 7727f2b..e4e5eae 100755 (executable)
--- a/client
+++ b/client
@@ -68,45 +68,44 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
     log_debug(dflag, 'RC ' + msg, idof=self._req, **kwargs)
 
   def dataReceived(self, data):
-    self._log(DBG.HTTP_CTRL, 'dataReceived', d=data)
-    try:
-      self._ssd.inputdata(mime_translate(data))
-    except Exception as e:
-      self._asyncfailure(e)
+    try: self._ssd.inputdata(mime_translate(data))
+    except Exception as e: asyncfailure(e)
 
   def connectionMade(self):
-    self._log(DBG.HTTP_CTRL, 'connectionMade', d=data)
+    self._log(DBG.HTTP_CTRL, 'connectionMade')
 
   def connectionLost(self, reason):
-    self._log(DBG.HTTP_CTRL, 'connectionLost', d=data)
+    self._log(DBG.HTTP_CTRL, 'connectionLost')
     if isinstance(reason, twisted.internet.error.ConnectionDone):
       try: self._ssd.flush()
-      except Exception as e:
-        self._asyncfailure(e)
+      except Exception as e: asyncfailure(e)
     else:
       self._asyncfailure(reason)
 
   def _asyncfailure(self, reason):
     global outstanding
     outstanding += 1
-    req_err(self._req, reason)
+    req_err(reason)
 
 def req_ok(req, resp):
-  log_http(DBG.HTTP_CTRL, 'req_ok ' % str(resp), idof=req)
-  resp.deliverBody(ResponseConsumer(req))
-  req_fin(req)
+  rc = ResponseConsumer(req)
+  resp.deliverBody(rc)
+  req_fin()
 
-def req_err(req, err):
-  log_http(DBG.HTTP_CTRL, 'req_err ' % str(err), idof=req)
+def req_err(err):
   print(err, file=sys.stderr)
-  reactor.callLater(c.http_retry, (lambda: req_fin(req)))
+  reactor.callLater(c.http_retry, req_fin)
 
-def req_fin(req):
-  log_http(DBG.HTTP_CTRL, 'req_fin', idof=req)
+def req_fin(*args):
   global outstanding
   outstanding -= 1
   check_outbound()
 
+def asyncfailure(reason):
+  global outstanding
+  outstanding += 1
+  req_err(reason)
+
 def check_outbound():
   global outstanding
 
@@ -146,23 +145,19 @@ def check_outbound():
     log_debug(DBG.HTTP_FULL, 'requesting: ' + str(mime))
 
     hh = { 'User-Agent': ['hippotat'],
-           'Content-Type': ['multipart/form-data; boundary="b"']
-#           , 'Content-Length': [str(len(mime))]
-    }
+           'Content-Type': ['multipart/form-data; boundary="b"'],
+           'Content-Length': [str(len(mime))] }
 
     bytesreader = io.BytesIO(mime)
     producer = twisted.web.client.FileBodyProducer(bytesreader)
 
     req = agent.request(b'POST',
                         c.url,
-                        twisted.web.client.Headers(hh)
-#                        , producer
-    )
-
-    log_debug(DBG.HTTP_CTRL, 'request', idof=req, d=d)
+                        twisted.web.client.Headers(hh),
+                        producer)
     req.addTimeout(c.http_timeout, reactor)
-    req.addCallbacks((lambda resp: req_ok(req,resp)),
-                     (lambda resp: req_err(req,resp)))
+    req.addCallback((lambda resp: req_ok(req, resp)))
+    req.addErrback(req_err)
     outstanding += 1
 
 common_startup()