# the file AGPLv3+CAFv2. If not, email Ian Jackson
# <ijackson@chiark.greenend.org.uk>.
-
+#@ import sys; sys.path.append('@PYBUILD_INSTALL_DIR@')
from hippotatlib import *
import os
from twisted.web.server import NOT_DONE_YET
import twisted.web.static
-import twisted.python.syslog
import hippotatlib.ownsource
from hippotatlib.ownsource import SourceShipmentPreparer
('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:
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
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')
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:
grandchildpid = os.fork()
if grandchildpid:
# we are the intermediate child
+ if opts.pidfile is not None:
+ print(grandchildpid, file=pidfile_h)
+ pidfile_h.close()
os._exit(0)
+ if opts.pidfile is not None:
+ pidfile_h.close()
+
logger = subprocess.Popen(['logger','-d',
'-t','hippotat(stderr)',
- '--id=%d' % os.getpid(),
+ '--id=%d' % mypid,
'-p',opts.syslogfacility + '.err'],
stdin=subprocess.PIPE,
stdout=subprocess.DEVNULL,
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()
start_http()