X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=client;h=543d2f5a092bdca876f3de8fcc4fdf3347c6ea57;hb=6f387df3234541f1066eff163d18fa6becf59c82;hp=e4e5eae7a01df3e180be74d170b6404f37a78f6f;hpb=3393242040c461d71187af33fb0338036784e513;p=hippotat.git

diff --git a/client b/client
index e4e5eae..543d2f5 100755
--- a/client
+++ b/client
@@ -68,44 +68,86 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
     log_debug(dflag, 'RC ' + msg, idof=self._req, **kwargs)
 
   def dataReceived(self, data):
-    try: self._ssd.inputdata(mime_translate(data))
-    except Exception as e: asyncfailure(e)
+    self._log(DBG.HTTP_CTRL, 'dataReceived', d=data)
+    try:
+      self._ssd.inputdata(mime_translate(data))
+    except Exception as e:
+      self._asyncfailure(e)
 
   def connectionMade(self):
     self._log(DBG.HTTP_CTRL, 'connectionMade')
 
   def connectionLost(self, reason):
-    self._log(DBG.HTTP_CTRL, 'connectionLost')
-    if isinstance(reason, twisted.internet.error.ConnectionDone):
-      try: self._ssd.flush()
-      except Exception as e: asyncfailure(e)
-    else:
+    self._log(DBG.HTTP_CTRL, 'connectionLost ' + str(reason))
+    if not reason.check(twisted.web.client.ResponseDone):
       self._asyncfailure(reason)
+      return
+    try:
+      self._ssd.flush()
+    except Exception as e:
+      self._asyncfailure(e)
 
   def _asyncfailure(self, reason):
-    global outstanding
-    outstanding += 1
-    req_err(reason)
+    self._log(DBG.HTTP_CTRL, '_asyncFailure ' + str(reason))
+    req_err(self._req, reason)
+
+class ErrorResponseConsumer(twisted.internet.protocol.Protocol):
+  def __init__(self, req, resp):
+    self._req = req
+    self._resp = resp
+
+    try:
+      self._phrase = resp.phrase.decode('utf-8')
+    except Exception:
+      self._phrase = repr(resp.phrase)
+
+    self._log(DBG.HTTP_CTRL, '__init__ %d %s' % (resp.code, self._phrase))
+
+  def _log(self, dflag, msg, **kwargs):
+    log_debug(dflag,'ERROR-RC '+msg, idof=self._req, **kwargs)
+
+  def connectionMade(self):
+    self._m = b''
+
+  def dataReceived(self, data):
+    self._log(DBG.HTTP_CTRL, 'dataReceived ' + repr(data))
+    self._m += data
+
+  def connectionLost(self, reason):
+    try:
+      mbody = self._m.decode('utf-8')
+    except Exception:
+      mbody = repr(self._m)
+    if not reason.check(twisted.web.client.ResponseDone):
+      mbody += ' || ' + str(reason)
+    req_err(self._req,
+            "FAILED %d %s | %s"
+            % (self._resp.code, self._phrase, mbody))
 
 def req_ok(req, resp):
-  rc = ResponseConsumer(req)
+  log_debug(DBG.HTTP_CTRL,
+            'req_ok %d %s %s' % (resp.code, repr(resp.phrase), str(resp)),
+            idof=req)
+  if resp.code == 200:
+    rc = ResponseConsumer(req)
+  else:
+    rc = ErrorResponseConsumer(req, resp)
+
   resp.deliverBody(rc)
-  req_fin()
 
-def req_err(err):
+def req_err(req, err):
+  log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)
+  if isinstance(err, twisted.python.failure.Failure):
+    err = err.getTraceback()
   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):
   global outstanding
   outstanding -= 1
+  log_debug(DBG.HTTP_CTRL, 'req_fin OS=%d' % outstanding, idof=req)
   check_outbound()
 
-def asyncfailure(reason):
-  global outstanding
-  outstanding += 1
-  req_err(reason)
-
 def check_outbound():
   global outstanding
 
@@ -155,10 +197,12 @@ def check_outbound():
                         c.url,
                         twisted.web.client.Headers(hh),
                         producer)
+
+    outstanding += 1
+    log_debug(DBG.HTTP_CTRL, 'request OS=%d' % outstanding, idof=req, d=d)
     req.addTimeout(c.http_timeout, reactor)
     req.addCallback((lambda resp: req_ok(req, resp)))
-    req.addErrback(req_err)
-    outstanding += 1
+    req.addErrback((lambda err: req_err(req, err)))
 
 common_startup()
 process_cfg()