X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/hippotat/blobdiff_plain/d96f4d70037bcd739dd9674f4fb2f3d38abce956..fa63bd9399a07c4b26affb3fc214291331d120b4:/hippotatd

diff --git a/hippotatd b/hippotatd
index e2bed42..e458853 100755
--- a/hippotatd
+++ b/hippotatd
@@ -104,7 +104,8 @@ class Client():
 
   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)
@@ -299,7 +300,7 @@ def process_cfg(_opts, putative_servers, putative_clients):
   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)
@@ -375,6 +376,10 @@ def daemonise():
       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')