wip

[hippotat.git] / client

diff --git a/client b/client
index 2765fa592b8a470b00e8b457245800047fd29a3c..ec28fd07de6c0f84cc5d960721ddd6dfb7f794ef 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, '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)
       try: self._ssd.flush()
       except Exception as e:
         self._asyncfailure(e)


@@ -87,29 +87,38 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
       self._asyncfailure(reason)
 
   def _asyncfailure(self, reason):
       self._asyncfailure(reason)
 
   def _asyncfailure(self, reason):

+    self._log(DBG.HTTP_CTRL, '_asyncFailure ' + str(reason))

     global outstanding
     outstanding += 1
     global outstanding
     outstanding += 1

-    req_err(reason)
+    req_err(self._req, reason)

 
 def req_ok(req, resp):
 
 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)
   rc = ResponseConsumer(req)
   resp.deliverBody(rc)

-  req_fin()
+  req_fin(req)

 
 

-def req_err(err):
+def req_err(req, err):
+  log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)

   print(err, file=sys.stderr)
   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()
 
   global outstanding
   outstanding -= 1
   check_outbound()
 

-def asyncfailure(reason):
-  global outstanding
-  outstanding += 1
-  req_err(reason)
-

 def check_outbound():
   global outstanding
 
 def check_outbound():
   global outstanding
 


@@ -159,9 +168,11 @@ def check_outbound():
                         c.url,
                         twisted.web.client.Headers(hh),
                         producer)
                         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.addTimeout(c.http_timeout, reactor)
     req.addCallback((lambda resp: req_ok(req, resp)))

-    req.addErrback(req_err)
+    req.addErrback((lambda err: req_err(req, err)))

     outstanding += 1
 
 common_startup()
     outstanding += 1
 
 common_startup()