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 e4e5eae7a01df3e180be74d170b6404f37a78f6f..afc792d3fd25ce13910ca455c6c4b178778b6674 100755
(executable)
--- a/
client
+++ b/
client
@@
-68,31
+68,38
@@
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.Connection
Done):
+ self._log(DBG.HTTP_CTRL, 'connectionLost
' + str(reason)
)
+ if
reason.check(twisted.web.client.Response
Done):
try: self._ssd.flush()
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):
else:
self._asyncfailure(reason)
def _asyncfailure(self, reason):
+ self._log(DBG.HTTP_CTRL, '_asyncFailure ' + str(reason))
global outstanding
outstanding += 1
global outstanding
outstanding += 1
- req_err(reason)
+ req_err(
self._req,
reason)
def req_ok(req, resp):
def req_ok(req, resp):
+ log_debug(DBG.HTTP_CTRL, 'req_ok ' + str(resp), idof=req)
rc = ResponseConsumer(req)
resp.deliverBody(rc)
req_fin()
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)
@@
-104,7
+111,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
+164,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()