chiark
/
gitweb
/
~ian
/
hippotat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip, towards target
[hippotat.git]
/
client
diff --git
a/client
b/client
index 16b23f525dc8e492ec66022e681ac7d0fd14ad1d..64025919900694a2955e97f298c8477cc62176af 100755
(executable)
--- a/
client
+++ b/
client
@@
-68,25
+68,36
@@
class ResponseConsumer(twisted.internet.protocol.Protocol):
log_debug(dflag, 'RC ' + msg, idof=self._req, **kwargs)
def dataReceived(self, data):
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)
+ 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')
def connectionLost(self, reason):
def connectionMade(self):
self._log(DBG.HTTP_CTRL, 'connectionMade')
def connectionLost(self, reason):
+ self._log(DBG.HTTP_CTRL, 'connectionLost')
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 _asyncfailure(self, reason):
+ global outstanding
+ outstanding += 1
+ req_err(self._req, reason)
def req_ok(req, resp):
rc = ResponseConsumer(req)
resp.deliverBody(rc)
req_fin()
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)
print(err, file=sys.stderr)
reactor.callLater(c.http_retry, req_fin)
@@
-98,7
+109,7
@@
def req_fin(*args):
def asyncfailure(reason):
global outstanding
outstanding += 1
def asyncfailure(reason):
global outstanding
outstanding += 1
- req_err(reason)
+ req_err(
None,
reason)
def check_outbound():
global outstanding
def check_outbound():
global outstanding
@@
-151,7
+162,7
@@
def check_outbound():
producer)
req.addTimeout(c.http_timeout, reactor)
req.addCallback((lambda resp: req_ok(req, resp)))
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()
outstanding += 1
common_startup()