chiark
/
gitweb
/
~ian
/
hippotat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix pidfile handling
[hippotat.git]
/
hippotatd
diff --git
a/hippotatd
b/hippotatd
index 248ea44c418695701963cfdb098fac634795b17d..123943a9cc9092eba885ee67cf2b0202f21461a5 100755
(executable)
--- a/
hippotatd
+++ b/
hippotatd
@@
-25,7
+25,7
@@
# the file AGPLv3+CAFv2. If not, email Ian Jackson
# <ijackson@chiark.greenend.org.uk>.
# 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 hippotatlib import *
import os
@@
-38,7
+38,6
@@
import twisted.internet
from twisted.web.server import NOT_DONE_YET
import twisted.web.static
from twisted.web.server import NOT_DONE_YET
import twisted.web.static
-import twisted.python.syslog
import hippotatlib.ownsource
from hippotatlib.ownsource import SourceShipmentPreparer
import hippotatlib.ownsource
from hippotatlib.ownsource import SourceShipmentPreparer
@@
-347,7
+346,9
@@
def catch_termination():
raise RuntimeError('did not die due to signal %s !' % name)
for sig in (signal.SIGINT, signal.SIGTERM):
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
def daemonise():
global syslogfacility
@@
-360,6
+361,7
@@
def daemonise():
facility=facilnum,
logoption=syslog.LOG_PID)
def emit(event):
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')
m = twisted.logger.formatEvent(event)
#print(repr(event), m, file=org_stderr)
level = event.get('log_level')
@@
-398,12
+400,12
@@
def daemonise():
if grandchildpid:
# we are the intermediate child
if opts.pidfile is not None:
if grandchildpid:
# we are the intermediate child
if opts.pidfile is not None:
- print(grandchildpid, file=p
f
h)
- p
f
h.close()
+ print(grandchildpid, file=p
idfile_
h)
+ p
idfile_
h.close()
os._exit(0)
os._exit(0)
- mypid = os.getpid()
-
pf
h.close()
+ if opts.pidfile is not None:
+
pidfile_
h.close()
logger = subprocess.Popen(['logger','-d',
'-t','hippotat(stderr)',
logger = subprocess.Popen(['logger','-d',
'-t','hippotat(stderr)',