# 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
from twisted.web.server import NOT_DONE_YET
import twisted.web.static
-import twisted.python.syslog
import hippotatlib.ownsource
from hippotatlib.ownsource import SourceShipmentPreparer
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')
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,