~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
process putatives: Fix processing of [<servername> <client>] sections
[hippotat]
/
hippotatd
diff --git
a/hippotatd
b/hippotatd
index
e458853
..
40f4c69
100755
(executable)
--- a/
hippotatd
+++ b/
hippotatd
@@
-126,7
+126,7
@@
class Client():
nf = request.notifyFinish()
nf.addErrback(self._req_error, request)
nf.addCallback(self._req_fin, request, cl)
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):
self._check_outbound()
def _req_write(self, req, d):
@@
-136,9
+136,9
@@
class Client():
def _check_outbound(self):
log_debug(DBG.HTTP_CTRL, 'CHKO')
while True:
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
except IndexError: request = None
- if request and
request.finish
ed:
+ if request and
nf.call
ed:
self._log(DBG.HTTP_CTRL, 'CHKO req finished, discard', idof=request)
self._rq.popleft()
continue
self._log(DBG.HTTP_CTRL, 'CHKO req finished, discard', idof=request)
self._rq.popleft()
continue
@@
-166,7
+166,7
@@
class Client():
# round again, looking for more to do
while len(self._rq) > self.cc.target_requests_outstanding:
# 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()
self._log(DBG.HTTP, 'CHKO above target, returning empty', idof=request)
request.finish()
@@
-297,7
+297,7
@@
def process_cfg(_opts, putative_servers, putative_clients):
global c
c = ConfigResults()
global c
c = ConfigResults()
- try: c.server = cfg
.
get('SERVER','server')
+ try: c.server = cfg
1
get('SERVER','server')
except NoOptionError: c.server = 'SERVER'
cfg_process_general(c, c.server)
except NoOptionError: c.server = 'SERVER'
cfg_process_general(c, c.server)
@@
-314,24
+314,24
@@
def process_cfg(_opts, putative_servers, putative_clients):
Client(ci, cc)
try:
Client(ci, cc)
try:
- c.vrelay = cfg
.
get(c.server, 'vrelay')
+ c.vrelay = cfg
1
get(c.server, 'vrelay')
except NoOptionError:
for search in c.vnetwork.hosts():
if search == c.vaddr: continue
c.vrelay = search
break
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 = cfg
1
get(c.server, 'ifname_server', raw=True)
except NoOptionError: pass
cfg_process_ipif(c,
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:
(('local','vaddr'),
('peer', 'vrelay'),
('rnets','vnetwork')))
if opts.printconfig is not None:
- try: val = cfg
.
get(c.server, opts.printconfig)
+ try: val = cfg
1
get(c.server, opts.printconfig)
except NoOptionError: pass
else: print(val)
sys.exit(0)
except NoOptionError: pass
else: print(val)
sys.exit(0)