X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=hippotatd;h=1865dad819a7231b2b743ac071076ec2b0e2f5e6;hp=0ef6369559c295b90d69e45aa78e0ce4129e7886;hb=26f04efff5ee7216ecc226d4eeadd01b970aa262;hpb=3c50650150eb06d783d14d6d9fd01ba38532a4ff

diff --git a/hippotatd b/hippotatd
index 0ef6369..1865dad 100755
--- a/hippotatd
+++ b/hippotatd
@@ -25,18 +25,20 @@
 #    the file AGPLv3+CAFv2.  If not, email Ian Jackson
 #    <ijackson@chiark.greenend.org.uk>.
 
-
+#@ sys.path.append(@PYBUILD_INSTALL_DIR@)
 from hippotatlib import *
 
 import os
 import tempfile
 import atexit
 import shutil
+import subprocess
 
 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
@@ -324,6 +326,12 @@ def process_cfg(_opts, putative_servers, putative_clients):
                     ('peer', 'vrelay'),
                     ('rnets','vnetwork')))
 
+  if opts.printconfig is not None:
+    try: val = cfg.get(c.server, opts.printconfig)
+    except NoOptionError: pass
+    else: print(val)
+    sys.exit(0)
+
 def catch_termination():
   def run_cleanups():
     for cleanup in cleanups:
@@ -341,6 +349,84 @@ def catch_termination():
   for sig in (signal.SIGINT, signal.SIGTERM):
     signal.signal(sig, partial(signal_handler, sig.name))
 
+def daemonise():
+  global syslogfacility
+  if opts.daemon and opts.syslogfacility is None:
+    opts.syslogfacility = 'daemon'
+
+  if opts.syslogfacility is not None:
+    facilnum = syslog.__dict__['LOG_' + opts.syslogfacility.upper()]
+    syslog.openlog('hippotatd',
+                   facility=facilnum,
+                   logoption=syslog.LOG_PID)
+    def emit(event):
+      m = twisted.logger.formatEvent(event)
+      #print(repr(event), m, file=org_stderr)
+      level = event.get('log_level')
+      if   event.get('dflag',None) is not None: sl = syslog.LOG_DEBUG
+      elif level == LogLevel.critical         : sl = syslog.LOG_CRIT
+      elif level == LogLevel.error            : sl = syslog.LOG_ERR
+      elif level == LogLevel.warn             : sl = syslog.LOG_WARNING
+      else                                    : sl = syslog.LOG_INFO
+      syslog.syslog(sl,m)
+    glp = twisted.logger.globalLogPublisher
+    glp.addObserver(emit)
+    log_debug(DBG.INIT, 'starting to log to syslog')
+
+  #log.crit('daemonic hippotatd crashed', dflag=False)
+  if opts.daemon:
+    daemonic_reactor = (twisted.internet.interfaces.IReactorDaemonize
+                        .providedBy(reactor))
+    if daemonic_reactor: reactor.beforeDaemonize()
+    if opts.pidfile is not None:
+      pidfile_h = open(opts.pidfile, 'w')
+    rfd, wfd = os.pipe()
+    childpid = os.fork()
+    if childpid:
+      # we are the parent
+      os.close(wfd)
+      st = os.read(rfd, 1)
+      try:
+        st = st[0]
+      except IndexError:
+        st = 127
+        log.critical('daemonic hippotatd crashed', dflag=False)
+      os._exit(st)
+    os.close(rfd)
+    os.setsid()
+    grandchildpid = os.fork()
+    if grandchildpid:
+      # we are the intermediate child
+      if opts.pidfile is not None:
+        print(grandchildpid, file=pfh)
+        pfh.close()
+      os._exit(0)
+
+    mypid = os.getpid()
+    pfh.close()
+                                                                        
+    logger = subprocess.Popen(['logger','-d',
+                               '-t','hippotat(stderr)',
+                               '--id=%d' % mypid,
+                               '-p',opts.syslogfacility + '.err'],
+                              stdin=subprocess.PIPE,
+                              stdout=subprocess.DEVNULL,
+                              stderr=subprocess.DEVNULL,
+                              restore_signals=True)
+    
+    nullfd = os.open('/dev/null', os.O_RDWR)
+    os.dup2(nullfd, 0)
+    os.dup2(nullfd, 1)
+    os.dup2(logger.stdin.fileno(), 2)
+    os.close(nullfd)
+    if daemonic_reactor: reactor.afterDaemonize()
+    log_debug(DBG.INIT, 'daemonised')
+    os.write(wfd, b'\0')
+    os.close(wfd)
+
+  if opts.syslogfacility is not None:
+    glp.removeObserver(hippotatlib.file_log_observer)
+
 optparser.add_option('--ownsource', default=2,
                      action='store_const', dest='ownsource', const=2,
                      help='source download fully enabled (default)')
@@ -353,8 +439,30 @@ optparser.add_option('--no-ownsource',
                      action='store_const', dest='ownsource', const=0,
                      help='source download disabled (for testing only)')
 
+optparser.add_option('--daemon',
+                     action='store_true', dest='daemon', default=False,
+                     help='daemonize (and log to syslog)')
+
+optparser.add_option('--pidfile',
+                     nargs=1, type='string',
+                     action='store', dest='pidfile', default=None,
+                     help='write pid to this file')
+
+optparser.add_option('--syslog-facility',
+                     nargs=1, type='string',action='store',
+                     metavar='FACILITY', dest='syslogfacility',
+                     default=None,
+                     help='log to syslog, with specified facility')
+
+optparser.add_option('--print-config',
+                     nargs=1, type='string',action='store',
+                     metavar='OPTION', dest='printconfig',
+                     default=None,
+                     help='print one config option value and exit')
+
 common_startup(process_cfg)
 catch_termination()
-ipif = start_ipif(c.ipif_command, (lambda p,s,d: route(p,"[ipif]",s,d)))
 start_http()
+daemonise()
+ipif = start_ipif(c.ipif_command, (lambda p,s,d: route(p,"[ipif]",s,d)))
 common_run()