~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip, towards target
[hippotat]
/
client
diff --git
a/client
b/client
index
e4e5eae
..
e0d6cf8
100755
(executable)
--- a/
client
+++ b/
client
@@
-68,8
+68,11
@@
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 connectionMade(self):
self._log(DBG.HTTP_CTRL, 'connectionMade')
@@
-78,21
+81,22
@@
class ResponseConsumer(twisted.internet.protocol.Protocol):
self._log(DBG.HTTP_CTRL, 'connectionLost')
if isinstance(reason, twisted.internet.error.ConnectionDone):
try: self._ssd.flush()
self._log(DBG.HTTP_CTRL, 'connectionLost')
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:
self._asyncfailure(reason)
def _asyncfailure(self, reason):
global outstanding
outstanding += 1
else:
self._asyncfailure(reason)
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_ok(req, resp):
rc = ResponseConsumer(req)
resp.deliverBody(rc)
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)
@@
-104,7
+108,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
@@
-157,7
+161,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()