chiark
/
gitweb
/
~mdw
/
hippotat
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e8fcf3b
)
wip
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 1 Apr 2017 18:43:36 +0000
(19:43 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 1 Apr 2017 18:43:36 +0000
(19:43 +0100)
client
patch
|
blob
|
blame
|
history
diff --git
a/client
b/client
index 856c6742b6827b00c362359e3fd0855361a152c5..270901506c4caec692694c1fc70494033bb6b1aa 100755
(executable)
--- a/
client
+++ b/
client
@@
-59,24
+59,42
@@
def outbound(packet, saddr, daddr):
check_outbound()
class ResponseConsumer(twisted.internet.protocol.Protocol):
check_outbound()
class ResponseConsumer(twisted.internet.protocol.Protocol):
- def __init__(self):
+ def __init__(self, req):
+ self._req = req
self._ssd = SlipStreamDecoder(queue_inbound)
self._ssd = SlipStreamDecoder(queue_inbound)
+
+ def _log(self, dflag, msg, **kwargs):
+ log_debug(dflag, 'RC ' + msg, idof=self._req, **kwargs)
+
def dataReceived(self, data):
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):
def connectionLost(self, reason):
+ self._log(DBG.HTTP_CTRL, 'connectionLost', d=data)
if isinstance(reason, twisted.internet.error.ConnectionDone):
try: self._ssd.flush()
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:
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()
req_fin()
-def req_err(err):
+def req_err(
req,
err):
print(err, file=sys.stderr)
reactor.callLater(c.http_retry, req_fin)
print(err, file=sys.stderr)
reactor.callLater(c.http_retry, req_fin)
@@
-85,11
+103,6
@@
def req_fin(*args):
outstanding -= 1
check_outbound()
outstanding -= 1
check_outbound()
-def asyncfailure(reason):
- global outstanding
- outstanding += 1
- req_err(reason)
-
def check_outbound():
global outstanding
def check_outbound():
global outstanding
@@
-137,8
+150,11
@@
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.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()
outstanding += 1
common_startup()