hippotatd: catch errors from request.finish in _req_cancel

[hippotat.git] / hippotatd

diff --git a/hippotatd b/hippotatd
index 834dc5d473169631e3885426ada81f4dd7c2cb37..f3d88d628afddbee0e8e88d81eab2e9a0fa979bb 100755 (executable)
--- a/hippotatd
+++ b/hippotatd
@@ -64,7 +64,7 @@ def route(packet, iface, saddr, daddr):
   elif daddr == c.vaddr or daddr not in c.vnetwork:
     lt('inbound')
     queue_inbound(ipif, packet)
-  elif daddr == c.relay:
+  elif daddr == c.vrelay:
     lt('discard relay')
     log_discard(packet, iface, saddr, daddr, 'relay')
   else:
@@ -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)
@@ -296,7 +297,8 @@ def process_cfg(_opts, putative_servers, putative_clients):
 
   global c
   c = ConfigResults()
-  c.server = cfg.get('SERVER','server')
+  try: c.server = cfg.get('SERVER','server')
+  except NoOptionError: c.server = 'SERVER'
 
   cfg_process_common(c, c.server)
   cfg_process_saddrs(c, c.server)
@@ -319,6 +321,9 @@ def process_cfg(_opts, putative_servers, putative_clients):
       c.vrelay = search
       break
 
+  try: c.ifname = cfg.get(c.server, 'ifname_server', raw=True)
+  except NoOptionError: pass
+
   cfg_process_ipif(c,
                    [c.server, 'DEFAULT'],
                    (('local','vaddr'),
@@ -371,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')
@@ -400,16 +409,15 @@ def daemonise():
     if grandchildpid:
       # we are the intermediate child
       if opts.pidfile is not None:
-        print(grandchildpid, file=pfh)
-        pfh.close()
+        print(grandchildpid, file=pidfile_h)
+        pidfile_h.close()
       os._exit(0)
 
-    mypid = os.getpid()
-    pfh.close()
+    if opts.pidfile is not None:
+      pidfile_h.close()
                                                                         
     logger = subprocess.Popen(['logger','-d',
-                               '-t','hippotat(stderr)',
-                               '--id=%d' % mypid,
+                               '-t','hippotat[%d](stderr)' % os.getpid(),
                                '-p',opts.syslogfacility + '.err'],
                               stdin=subprocess.PIPE,
                               stdout=subprocess.DEVNULL,