wip

[hippotat.git] / client

diff --git a/client b/client
index afc792d3fd25ce13910ca455c6c4b178778b6674..ec28fd07de6c0f84cc5d960721ddd6dfb7f794ef 100755 (executable)
--- a/client
+++ b/client
@@ -93,26 +93,32 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
     req_err(self._req, reason)
 
 def req_ok(req, resp):
     req_err(self._req, reason)
 
 def req_ok(req, resp):

-  log_debug(DBG.HTTP_CTRL, 'req_ok ' + str(resp), idof=req)
+  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(req, err):
   log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)
   print(err, file=sys.stderr)
 
 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()
 
   global outstanding
   outstanding -= 1
   check_outbound()
 

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

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


@@ -162,6 +168,8 @@ 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.addErrback((lambda err: req_err(req, err)))
     req.addTimeout(c.http_timeout, reactor)
     req.addCallback((lambda resp: req_ok(req, resp)))
     req.addErrback((lambda err: req_err(req, err)))