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):
- log_http(DBG.HTTP_CTRL, 'req_ok ' % str(resp), idof=req)
- resp.deliverBody(ResponseConsumer(req))
+ 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_http(DBG.HTTP_CTRL, 'req_err ' % str(err), idof=req)
+ log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)
print(err, file=sys.stderr)
reactor.callLater(c.http_retry, (lambda: req_fin(req)))
def req_fin(req):
- log_http(DBG.HTTP_CTRL, 'req_fin', idof=req)
+ log_debug(DBG.HTTP_CTRL, 'req_fin', idof=req)
global outstanding
outstanding -= 1
check_outbound()
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()