config: fix client config (no SERVER)

[hippotat.git] / hippotatd

diff --git a/hippotatd b/hippotatd
index 1865dad819a7231b2b743ac071076ec2b0e2f5e6..fe10eeca6166186c49af06ae6da93d8b45a35dde 100755 (executable)
--- a/hippotatd
+++ b/hippotatd
@@ -25,7 +25,7 @@
 #    the file AGPLv3+CAFv2.  If not, email Ian Jackson
 #    <ijackson@chiark.greenend.org.uk>.
 
-#@ sys.path.append(@PYBUILD_INSTALL_DIR@)
+#@ import sys; sys.path.append('@PYBUILD_INSTALL_DIR@')
 from hippotatlib import *
 
 import os
@@ -38,7 +38,6 @@ import twisted.internet
 from twisted.web.server import NOT_DONE_YET
 
 import twisted.web.static
-import twisted.python.syslog
 
 import hippotatlib.ownsource
 from hippotatlib.ownsource import SourceShipmentPreparer
@@ -297,7 +296,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)
@@ -347,7 +347,9 @@ def catch_termination():
     raise RuntimeError('did not die due to signal %s !' % name)
 
   for sig in (signal.SIGINT, signal.SIGTERM):
-    signal.signal(sig, partial(signal_handler, sig.name))
+    try: signame = sig.name
+    except AttributeError: signame = "signal %d" % sig
+    signal.signal(sig, partial(signal_handler, signame))
 
 def daemonise():
   global syslogfacility
@@ -360,6 +362,7 @@ def daemonise():
                    facility=facilnum,
                    logoption=syslog.LOG_PID)
     def emit(event):
+      if logevent_is_boringtwisted(event): return
       m = twisted.logger.formatEvent(event)
       #print(repr(event), m, file=org_stderr)
       level = event.get('log_level')
@@ -398,16 +401,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,