nf = request.notifyFinish()
nf.addErrback(self._req_error, request)
nf.addCallback(self._req_fin, request, cl)
- self._rq.append(request)
+ self._rq.append((request,nf))
self._check_outbound()
def _req_write(self, req, d):
def _check_outbound(self):
log_debug(DBG.HTTP_CTRL, 'CHKO')
while True:
- try: request = self._rq[0]
+ try: (request,nf) = self._rq[0]
except IndexError: request = None
- if request and request.finished:
+ if request and nf.called:
self._log(DBG.HTTP_CTRL, 'CHKO req finished, discard', idof=request)
self._rq.popleft()
continue
# round again, looking for more to do
while len(self._rq) > self.cc.target_requests_outstanding:
- request = self._rq.popleft()
+ (request, nf) = self._rq.popleft()
self._log(DBG.HTTP, 'CHKO above target, returning empty', idof=request)
request.finish()
# why this is not the default is a mystery!
def getChild(self, name, request):
if name == b'': return self
- else: return twisted.web.resource.Resource.getChild(name, request)
+ else: return twisted.web.resource.Resource.getChild(self, name, request)
class IphttpResource(NotStupidResource):
def render_POST(self, request):
global c
c = ConfigResults()
- try: c.server = cfg.get('SERVER','server')
+ try: c.server = cfg1get('SERVER','server')
except NoOptionError: c.server = 'SERVER'
cfg_process_general(c, c.server)
Client(ci, cc)
try:
- c.vrelay = cfg.get(c.server, 'vrelay')
+ c.vrelay = cfg1get(c.server, 'vrelay')
except NoOptionError:
for search in c.vnetwork.hosts():
if search == c.vaddr: continue
c.vrelay = search
break
- try: c.ifname = cfg.get(c.server, 'ifname_server', raw=True)
+ try: c.ifname = cfg1get(c.server, 'ifname_server', raw=True)
except NoOptionError: pass
cfg_process_ipif(c,
- [c.server, 'DEFAULT'],
+ [c.server, 'COMMON'],
(('local','vaddr'),
('peer', 'vrelay'),
('rnets','vnetwork')))
if opts.printconfig is not None:
- try: val = cfg.get(c.server, opts.printconfig)
+ try: val = cfg1get(c.server, opts.printconfig)
except NoOptionError: pass
else: print(val)
sys.exit(0)