X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=client;h=e3fcd0d8f368936ea5dfaef1d6be3312216189f7;hb=db6ba5840b00c61fe6e576b54179ddeb30202b0e;hp=856c6742b6827b00c362359e3fd0855361a152c5;hpb=dd6665eea9fc248770b757a4314c3c2b8de7cc86;p=hippotat.git

diff --git a/client b/client
index 856c674..e3fcd0d 100755
--- a/client
+++ b/client
@@ -59,37 +59,98 @@ def outbound(packet, saddr, daddr):
   check_outbound()
 
 class ResponseConsumer(twisted.internet.protocol.Protocol):
-  def __init__(self):
-    self._ssd = SlipStreamDecoder(queue_inbound)
+  def __init__(self, req):
+    self._req = req
+    self._ssd = SlipStreamDecoder('req %s' % id(req), queue_inbound)
+    self._log(DBG.HTTP_CTRL, '__init__')
+
+  def _log(self, dflag, msg, **kwargs):
+    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)
-  def connectionMade(self): pass
+    self._log(DBG.HTTP_CTRL, 'dataReceived', d=data)
+    try:
+      self._ssd.inputdata(mime_translate(data))
+    except Exception as e:
+      self._handleexception()
+
+  def connectionMade(self):
+    self._log(DBG.HTTP_CTRL, 'connectionMade')
+
   def connectionLost(self, reason):
-    if isinstance(reason, twisted.internet.error.ConnectionDone):
-      try: self._ssd.flush()
-      except Exception as e: asyncfailure(e)
-    else:
-      asyncfailure(reason)
+    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._handleexception()
+
+  def _handleexception(self):
+    self._asyncfailure(traceback.format_exc())
+
+  def _asyncfailure(self, 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 req_ok(resp):
-  resp.deliverBody(ResponseConsumer())
-  req_fin()
+  def connectionMade(self):
+    self._m = b''
 
-def req_err(err):
+  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):
+  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)
+
+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
 
@@ -103,6 +164,8 @@ def check_outbound():
                   moredata,
                   c.max_batch_up)
     
+    d = mime_translate(d)
+
     crlf = b'\r\n'
     lf   =   b'\n'
     mime = (b'--b'                                        + crlf +
@@ -115,7 +178,7 @@ def check_outbound():
             b'--b'                                        + crlf +
             b'Content-Type: application/octet-stream'     + crlf +
             b'Content-Disposition: form-data; name="d"'   + crlf + crlf +
-            mime_translate(d)                             + crlf
+            d                                             + crlf
            ) if len(d) else b'')                               +
             b'--b--'                                      + crlf)
 
@@ -137,9 +200,12 @@ def check_outbound():
                         c.url,
                         twisted.web.client.Headers(hh),
                         producer)
-    req.addTimeout(c.http_timeout, reactor)
-    req.addCallbacks(req_ok, req_err)
+
     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((lambda err: req_err(req, err)))
 
 common_startup()
 process_cfg()