# plus from config:
# .max_batch_down
# .max_queue_time
- # .max_request_time
# .target_requests_outstanding
if ip not in c.network:
raise ValueError('client %s not in network' % ip)
- for k in ('max_batch_down','max_queue_time','max_request_time',
+ for k in ('max_batch_down','max_queue_time','http_timeout',
'target_requests_outstanding'):
req = cfg.getint(cs, k)
limit = cfg.getint('limits',k)
def new_request(self, request):
request.setHeader('Content-Type','application/octet-stream')
- reactor.callLater(self.max_request_time, self._req_cancel, request)
+ reactor.callLater(self.http_timeout, self._req_cancel, request)
request.notifyFinish().addErrback(self._req_error, request)
self._rq.append(request)
self._check_outbound()
# find client, update config, etc.
metadata = request.args[b'm'][0]
metadata = metadata.split(b'\r\n')
- (ci_s, pw, tro) = metadata[0:3]
- desca['m[0,2]'] = [ci_s, tro]
+ (ci_s, pw, tro, cto) = metadata[0:4]
+ desca['m[0,2:3]'] = [ci_s, tro, cto]
ci_s = ci_s.decode('utf-8')
- tro = int(tro)
- desca['tro']= tro
+ tro = int(tro); desca['tro']= tro
+ cto = int(cto); desca['cto']= cto
ci = ipaddr(ci_s)
desca['ci'] = ci
cl = clients[ci]
if tro != cl.target_requests_outstanding:
raise ValueError('tro must be %d' % cl.target_requests_outstanding)
+ if cto < cl.http_timeout:
+ raise ValueError('cto must be >= %d' % cl.http_timeout)
+
try:
d = request.args[b'd'][0]
desca['d'] = d