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)
self._asyncfailure(e)
def connectionMade(self):
- self._log(DBG.HTTP_CTRL, 'connectionMade', d=data)
+ self._log(DBG.HTTP_CTRL, 'connectionMade')
def connectionLost(self, reason):
- self._log(DBG.HTTP_CTRL, 'connectionLost', d=data)
- if isinstance(reason, twisted.internet.error.ConnectionDone):
+ self._log(DBG.HTTP_CTRL, 'connectionLost ' + str(reason))
+ if reason.check(twisted.web.client.ResponseDone):
try: self._ssd.flush()
except Exception as e:
self._asyncfailure(e)
self._asyncfailure(reason)
def _asyncfailure(self, reason):
+ self._log(DBG.HTTP_CTRL, '_asyncFailure ' + str(reason))
global outstanding
outstanding += 1
req_err(self._req, reason)
def req_ok(req, resp):
- resp.deliverBody(ResponseConsumer(req))
- req_fin()
+ log_debug(DBG.HTTP_CTRL,
+ 'req_ok %d %s %s' % (resp.code, repr(resp.phrase), str(resp)),
+ idof=req)
+ if resp.code != 200:
+ try:
+ phrase = resp.phrase.decode('utf-8')
+ except UnicodeDecodeError:
+ phrase = repr(resp.phrase)
+ req_err(req, "FAILED %d %s" % (resp.code, phrase))
+ return
+
+ rc = ResponseConsumer(req)
+ resp.deliverBody(rc)
+ req_fin(req)
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)
+ reactor.callLater(c.http_retry, (lambda: req_fin(req)))
-def req_fin(*args):
+def req_fin(req):
+ log_debug(DBG.HTTP_CTRL, 'req_fin', idof=req)
global outstanding
outstanding -= 1
check_outbound()
moredata,
c.max_batch_up)
+ d = mime_translate(d)
+
crlf = b'\r\n'
lf = b'\n'
mime = (b'--b' + 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)
log_debug(DBG.HTTP_CTRL, 'request', idof=req, d=d)
req.addTimeout(c.http_timeout, reactor)
- req.addCallbacks((lambda resp: req_ok(req,resp)),
- (lambda resp: req_err(req,resp)))
+ req.addCallback((lambda resp: req_ok(req, resp)))
+ req.addErrback((lambda err: req_err(req, err)))
outstanding += 1
common_startup()