c.routes = cfg.get('virtual','routes')
c.max_queue_time = cfg.getint(client_cs, 'max_queue_time')
c.max_batch_up = cfg.getint(client_cs, 'max_batch_up')
- c.http_timeout = cfg.getint(client_cs, 'http_timeout')
c.http_retry = cfg.getint(client_cs, 'http_retry')
+ c.http_timeout = (cfg.getint(client_cs, 'http_timeout') +
+ cfg.getint(client_cs, 'http_timeout_grace'))
process_cfg_ipif(client_cs,
(('local', 'client'),
('peer', 'server'),
('rnets', 'routes')))
-outstanding = 0
+outstanding = { }
+
+def log_outstanding():
+ log_debug(DBG.CTRL_DUMP, 'OS %s' % outstanding)
def start_client():
global queue
queue.append(packet)
check_outbound()
-class ResponseConsumer(twisted.internet.protocol.Protocol):
- def __init__(self, req):
+class GeneralResponseConsumer(twisted.internet.protocol.Protocol):
+ def __init__(self, req, desc):
self._req = req
- self._ssd = SlipStreamDecoder(queue_inbound)
- self._log(DBG.HTTP_CTRL, '__init__')
+ self._desc = desc
def _log(self, dflag, msg, **kwargs):
- 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)
+ log_debug(dflag, '%s: %s' % (self._desc, msg), idof=self._req, **kwargs)
def connectionMade(self):
self._log(DBG.HTTP_CTRL, 'connectionMade')
+class ResponseConsumer(GeneralResponseConsumer):
+ def __init__(self, req):
+ super().__init__(req, 'RC')
+ ssddesc = '[%s] %s' % (id(req), self._desc)
+ self._ssd = SlipStreamDecoder(ssddesc, queue_inbound)
+ self._log(DBG.HTTP_CTRL, '__init__')
+
+ def dataReceived(self, data):
+ self._log(DBG.HTTP, 'dataReceived', d=data)
+ try:
+ self._ssd.inputdata(data)
+ except Exception as e:
+ self._handleexception()
+
def connectionLost(self, reason):
- if isinstance(reason, twisted.internet.error.ConnectionDone):
- try: self._ssd.flush()
- except Exception as e: asyncfailure(e)
- else:
- asyncfailure(reason)
+ self._log(DBG.HTTP_CTRL, 'connectionLost ' + str(reason))
+ if not reason.check(twisted.web.client.ResponseDone):
+ self.latefailure()
+ return
+ try:
+ self._log(DBG.HTTP, 'ResponseDone')
+ self._ssd.flush()
+ req_fin(self._req)
+ except Exception as e:
+ self._handleexception()
+
+ def _handleexception(self):
+ self._latefailure(traceback.format_exc())
+
+ def _latefailure(self, reason):
+ self._log(DBG.HTTP_CTRL, '_latefailure ' + str(reason))
+ req_err(self._req, reason)
+
+class ErrorResponseConsumer(twisted.internet.protocol.Protocol):
+ def __init__(self, req, resp):
+ super().__init__(req, 'ERROR-RC')
+ self._resp = resp
+ self._m = b''
+ try:
+ self._phrase = resp.phrase.decode('utf-8')
+ except Exception:
+ self._phrase = repr(resp.phrase)
+ self._log(DBG.HTTP_CTRL, '__init__ %d %s' % (resp.code, self._phrase))
+
+ def dataReceived(self, data):
+ self._log(DBG.HTTP_CTRL, 'dataReceived ' + repr(data))
+ self._m += data
+
+ def connectionLost(self, reason):
+ try:
+ mbody = self._m.decode('utf-8')
+ except Exception:
+ mbody = repr(self._m)
+ if not reason.check(twisted.web.client.ResponseDone):
+ mbody += ' || ' + str(reason)
+ req_err(self._req,
+ "FAILED %d %s | %s"
+ % (self._resp.code, self._phrase, mbody))
def req_ok(req, resp):
- rc = ResponseConsumer(req)
- resp.deliverBody(rc)
- 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:
+ rc = ResponseConsumer(req)
+ else:
+ rc = ErrorResponseConsumer(req, resp)
-def req_err(err):
- print(err, file=sys.stderr)
- reactor.callLater(c.http_retry, req_fin)
+ resp.deliverBody(rc)
+ # now rc is responsible for calling req_fin
-def req_fin(*args):
- global outstanding
- outstanding -= 1
+def req_err(req, err):
+ # called when the Deferred fails, or (if it completes),
+ # later, by ResponsConsumer or ErrorResponsConsumer
+ try:
+ log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)
+ if isinstance(err, twisted.python.failure.Failure):
+ err = err.getTraceback()
+ print('[%#x] %s' % (id(req), err), file=sys.stderr)
+ if not isinstance(outstanding[req], int):
+ raise RuntimeError('[%#x] previously %s' % (id(req), outstanding[req]))
+ outstanding[req] = err
+ log_outstanding()
+ reactor.callLater(c.http_retry, partial(req_fin, req))
+ except Exception as e:
+ crash(traceback.format_exc() + '\n----- handling -----\n' + err)
+
+def req_fin(req):
+ del outstanding[req]
+ log_debug(DBG.HTTP_CTRL, 'req_fin OS=%d' % len(outstanding), idof=req)
check_outbound()
-def asyncfailure(reason):
- global outstanding
- outstanding += 1
- req_err(reason)
+class Errb:
+ def __init__(self, req):
+ self._req = req
+ def call(self, err):
+ req_err(self._req, err)
def check_outbound():
global outstanding
while True:
- if outstanding >= c.max_outstanding : break
- if not queue.nonempty() and outstanding >= c.target_outstanding: break
+ if len(outstanding) >= c.max_outstanding : break
+ if not queue.nonempty() and len(outstanding) >= c.target_outstanding: break
d = b''
def moredata(s): nonlocal d; d += s
str(c.client) .encode('ascii') + crlf +
password + crlf +
str(c.target_outstanding) .encode('ascii') + crlf +
+ str(c.http_timeout) .encode('ascii') + crlf +
((
b'--b' + crlf +
b'Content-Type: application/octet-stream' + crlf +
c.url,
twisted.web.client.Headers(hh),
producer)
+
+ outstanding[req] = len(d)
+ log_debug(DBG.HTTP_CTRL, 'request OS=%d' % len(outstanding), idof=req, d=d)
req.addTimeout(c.http_timeout, reactor)
- req.addCallback((lambda resp: req_ok(req, resp)))
- req.addErrback(req_err)
- outstanding += 1
+ req.addCallback(partial(req_ok, req))
+ req.addErrback(partial(req_err, req))
+
+ log_outstanding()
common_startup()
process_cfg()
~ian / hippotat.git / blobdiff