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 270901506c4caec692694c1fc70494033bb6b1aa..e4e5eae7a01df3e180be74d170b6404f37a78f6f 100755
(executable)
--- a/
client
+++ b/
client
@@
-62,39
+62,37
@@
class ResponseConsumer(twisted.internet.protocol.Protocol):
def __init__(self, req):
self._req = req
self._ssd = SlipStreamDecoder(queue_inbound)
def __init__(self, req):
self._req = req
self._ssd = SlipStreamDecoder(queue_inbound)
+ self._log(DBG.HTTP_CTRL, '__init__')
def _log(self, dflag, msg, **kwargs):
log_debug(dflag, 'RC ' + msg, idof=self._req, **kwargs)
def dataReceived(self, data):
def _log(self, dflag, msg, **kwargs):
log_debug(dflag, 'RC ' + msg, idof=self._req, **kwargs)
def dataReceived(self, data):
- self._log(DBG.HTTP_CTRL, 'dataReceived', d=data)
- try:
- self._ssd.inputdata(mime_translate(data))
- except Exception as e:
- self._asyncfailure(e)
+ try: self._ssd.inputdata(mime_translate(data))
+ except Exception as e: asyncfailure(e)
def connectionMade(self):
def connectionMade(self):
- self._log(DBG.HTTP_CTRL, 'connectionMade'
, d=data
)
+ self._log(DBG.HTTP_CTRL, 'connectionMade')
def connectionLost(self, reason):
def connectionLost(self, reason):
- self._log(DBG.HTTP_CTRL, 'connectionLost'
, d=data
)
+ 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:
- self._asyncfailure(e)
+ except Exception as e: 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(
self._req,
reason)
+ req_err(reason)
def req_ok(req, resp):
def req_ok(req, resp):
- resp.deliverBody(ResponseConsumer(req))
+ rc = ResponseConsumer(req)
+ resp.deliverBody(rc)
req_fin()
req_fin()
-def req_err(
req,
err):
+def req_err(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)
@@
-103,6
+101,11
@@
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
@@
-116,6
+119,8
@@
def check_outbound():
moredata,
c.max_batch_up)
moredata,
c.max_batch_up)
+ d = mime_translate(d)
+
crlf = b'\r\n'
lf = b'\n'
mime = (b'--b' + crlf +
crlf = b'\r\n'
lf = b'\n'
mime = (b'--b' + crlf +
@@
-128,7
+133,7
@@
def check_outbound():
b'--b' + crlf +
b'Content-Type: application/octet-stream' + crlf +
b'Content-Disposition: form-data; name="d"' + crlf + crlf +
b'--b' + crlf +
b'Content-Type: application/octet-stream' + crlf +
b'Content-Disposition: form-data; name="d"' + crlf + crlf +
-
mime_translate(d)
+ crlf
+
d
+ crlf
) if len(d) else b'') +
b'--b--' + crlf)
) if len(d) else b'') +
b'--b--' + crlf)
@@
-150,11
+155,9
@@
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.addCallback
s((lambda resp: req_ok(req,resp)),
-
(lambda resp: req_err(req,resp))
)
+ req.addCallback
((lambda resp: req_ok(req, resp)))
+
req.addErrback(req_err
)
outstanding += 1
common_startup()
outstanding += 1
common_startup()