X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=client;h=64025919900694a2955e97f298c8477cc62176af;hb=3a7aaa41178a5e0aed6c3214414a8f00e26e7177;hp=2765fa592b8a470b00e8b457245800047fd29a3c;hpb=082d973e167d4f8ee6d05711ebcd8ef2a78edc35;p=hippotat.git diff --git a/client b/client index 2765fa5..6402591 100755 --- a/client +++ b/client @@ -89,14 +89,15 @@ class ResponseConsumer(twisted.internet.protocol.Protocol): def _asyncfailure(self, reason): global outstanding outstanding += 1 - req_err(reason) + req_err(self._req, reason) def req_ok(req, resp): rc = ResponseConsumer(req) 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) print(err, file=sys.stderr) reactor.callLater(c.http_retry, req_fin) @@ -108,7 +109,7 @@ def req_fin(*args): def asyncfailure(reason): global outstanding outstanding += 1 - req_err(reason) + req_err(None, reason) def check_outbound(): global outstanding @@ -161,7 +162,7 @@ def check_outbound(): producer) req.addTimeout(c.http_timeout, reactor) req.addCallback((lambda resp: req_ok(req, resp))) - req.addErrback(req_err) + req.addErrback((lambda err: req_err(req, err))) outstanding += 1 common_startup()