chiark
/
gitweb
/
~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move cfg_get_raw into hippotatlib
[hippotat]
/
hippotatd
diff --git
a/hippotatd
b/hippotatd
index b08ce6673d9cd9373a7025a7908f0f3ef3fc0a97..e4588536181a657dea2f261e7d303c9041ceb1a8 100755
(executable)
--- a/
hippotatd
+++ b/
hippotatd
@@
-104,7
+104,8
@@
class Client():
def _req_cancel(self, request):
self._log(DBG.HTTP_CTRL, 'cancel', idof=request)
def _req_cancel(self, request):
self._log(DBG.HTTP_CTRL, 'cancel', idof=request)
- request.finish()
+ try: request.finish()
+ except Exception: pass
def _req_error(self, err, request):
self._log(DBG.HTTP_CTRL, 'error %s' % err, idof=request)
def _req_error(self, err, request):
self._log(DBG.HTTP_CTRL, 'error %s' % err, idof=request)
@@
-299,7
+300,7
@@
def process_cfg(_opts, putative_servers, putative_clients):
try: c.server = cfg.get('SERVER','server')
except NoOptionError: c.server = 'SERVER'
try: c.server = cfg.get('SERVER','server')
except NoOptionError: c.server = 'SERVER'
- cfg_process_
common
(c, c.server)
+ cfg_process_
general
(c, c.server)
cfg_process_saddrs(c, c.server)
cfg_process_vnetwork(c, c.server)
cfg_process_vaddr(c, c.server)
cfg_process_saddrs(c, c.server)
cfg_process_vnetwork(c, c.server)
cfg_process_vaddr(c, c.server)