X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=client;h=fcdc665224110a3ae1d27a43e6e4814e9b68852c;hb=02cdcb524f39817d80da3541d3143f698b666ebd;hp=270901506c4caec692694c1fc70494033bb6b1aa;hpb=bd9e77fb859455383fdfc162fb9e1bdaf7a3289e;p=hippotat.git

diff --git a/client b/client
index 2709015..fcdc665 100755
--- a/client
+++ b/client
@@ -61,7 +61,8 @@ def outbound(packet, saddr, daddr):
 class ResponseConsumer(twisted.internet.protocol.Protocol):
   def __init__(self, req):
     self._req = req
-    self._ssd = SlipStreamDecoder(queue_inbound)
+    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)
@@ -69,38 +70,85 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
   def dataReceived(self, data):
     self._log(DBG.HTTP_CTRL, 'dataReceived', d=data)
     try:
-      self._ssd.inputdata(mime_translate(data))
+      self._ssd.inputdata(data)
     except Exception as e:
-      self._asyncfailure(e)
+      self._handleexception()
 
   def connectionMade(self):
-    self._log(DBG.HTTP_CTRL, 'connectionMade', d=data)
+    self._log(DBG.HTTP_CTRL, 'connectionMade')
 
   def connectionLost(self, reason):
-    self._log(DBG.HTTP_CTRL, 'connectionLost', d=data)
-    if isinstance(reason, twisted.internet.error.ConnectionDone):
-      try: self._ssd.flush()
-      except Exception as e:
-        self._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._handleexception()
+
+  def _handleexception(self):
+    self._asyncfailure(traceback.format_exc())
 
   def _asyncfailure(self, reason):
-    global outstanding
-    outstanding += 1
+    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):
-  resp.deliverBody(ResponseConsumer(req))
-  req_fin()
+  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 check_outbound():
@@ -116,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 +
@@ -128,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)
 
@@ -151,11 +201,11 @@ def check_outbound():
                         twisted.web.client.Headers(hh),
                         producer)
 
-    log_debug(DBG.HTTP_CTRL, 'request', idof=req, d=d)
-    req.addTimeout(c.http_timeout, reactor)
-    req.addCallbacks((lambda resp: req_ok(req,resp)),
-                     (lambda resp: req_err(req,resp)))
     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()