chiark / gitweb /
wip
[hippotat.git] / client
diff --git a/client b/client
index 6402591..ec28fd0 100755 (executable)
--- a/client
+++ b/client
@@ -78,8 +78,8 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
     self._log(DBG.HTTP_CTRL, 'connectionMade')
 
   def connectionLost(self, reason):
-    self._log(DBG.HTTP_CTRL, 'connectionLost')
-    if isinstance(reason, twisted.internet.error.ConnectionDone):
+    self._log(DBG.HTTP_CTRL, 'connectionLost ' + str(reason))
+    if reason.check(twisted.web.client.ResponseDone):
       try: self._ssd.flush()
       except Exception as e:
         self._asyncfailure(e)
@@ -87,30 +87,38 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
       self._asyncfailure(reason)
 
   def _asyncfailure(self, reason):
+    self._log(DBG.HTTP_CTRL, '_asyncFailure ' + str(reason))
     global outstanding
     outstanding += 1
     req_err(self._req, reason)
 
 def req_ok(req, resp):
+  log_debug(DBG.HTTP_CTRL,
+            'req_ok %d %s %s' % (resp.code, repr(resp.phrase), str(resp)),
+            idof=req)
+  if resp.code != 200:
+    try:
+      phrase = resp.phrase.decode('utf-8')
+    except UnicodeDecodeError:
+      phrase = repr(resp.phrase)
+    req_err(req, "FAILED %d %s" % (resp.code, phrase))
+    return
+
   rc = ResponseConsumer(req)
   resp.deliverBody(rc)
-  req_fin()
+  req_fin(req)
 
 def req_err(req, err):
   log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)
   print(err, file=sys.stderr)
-  reactor.callLater(c.http_retry, req_fin)
+  reactor.callLater(c.http_retry, (lambda: req_fin(req)))
 
-def req_fin(*args):
+def req_fin(req):
+  log_debug(DBG.HTTP_CTRL, 'req_fin', idof=req)
   global outstanding
   outstanding -= 1
   check_outbound()
 
-def asyncfailure(reason):
-  global outstanding
-  outstanding += 1
-  req_err(None, reason)
-
 def check_outbound():
   global outstanding
 
@@ -160,6 +168,8 @@ def check_outbound():
                         c.url,
                         twisted.web.client.Headers(hh),
                         producer)
+
+    log_debug(DBG.HTTP_CTRL, 'request', idof=req, d=d)
     req.addTimeout(c.http_timeout, reactor)
     req.addCallback((lambda resp: req_ok(req, resp)))
     req.addErrback((lambda err: req_err(req, err)))