check_outbound()
class ResponseConsumer(twisted.internet.protocol.Protocol):
- def __init__(self):
+ def __init__(self, req):
+ self._req = req
self._ssd = SlipStreamDecoder(queue_inbound)
+
+ 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._asyncfailure(e)
+
+ def connectionMade(self):
+ self._log(DBG.HTTP_CTRL, 'connectionMade', d=data)
+
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: asyncfailure(e)
+ except Exception as e:
+ self._asyncfailure(e)
else:
- asyncfailure(reason)
+ self._asyncfailure(reason)
-def req_ok(resp):
- resp.deliverBody(ResponseConsumer())
+ def _asyncfailure(self, reason):
+ global outstanding
+ outstanding += 1
+ req_err(self._req, reason)
+
+def req_ok(req, resp):
+ resp.deliverBody(ResponseConsumer(req))
req_fin()
-def req_err(err):
+def req_err(req, err):
print(err, file=sys.stderr)
reactor.callLater(c.http_retry, req_fin)
outstanding -= 1
check_outbound()
-def asyncfailure(reason):
- global outstanding
- outstanding += 1
- req_err(reason)
-
def check_outbound():
global outstanding
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.addCallbacks(req_ok, req_err)
+ req.addCallbacks((lambda resp: req_ok(req,resp)),
+ (lambda resp: req_err(req,resp)))
outstanding += 1
common_startup()