~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
config: Abolish use of ConfigParser's DEFAULT feature
[hippotat]
/
hippotatd
diff --git
a/hippotatd
b/hippotatd
index
e2bed42
..
0482876
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)
@@
-296,10
+297,10
@@
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'
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)
@@
-313,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)
@@
-375,6
+376,10
@@
def daemonise():
elif level == LogLevel.warn : sl = syslog.LOG_WARNING
else : sl = syslog.LOG_INFO
syslog.syslog(sl,m)
elif level == LogLevel.warn : sl = syslog.LOG_WARNING
else : sl = syslog.LOG_INFO
syslog.syslog(sl,m)
+ failure = event.get('log_failure')
+ if failure is not None:
+ for l in failure.getTraceback().split('\n'):
+ syslog.syslog(sl,l)
glp = twisted.logger.globalLogPublisher
glp.addObserver(emit)
log_debug(DBG.INIT, 'starting to log to syslog')
glp = twisted.logger.globalLogPublisher
glp.addObserver(emit)
log_debug(DBG.INIT, 'starting to log to syslog')