~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix pidfile handling
[hippotat]
/
hippotatd
diff --git
a/hippotatd
b/hippotatd
index
e3e42fb
..
123943a
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
@@
-326,6
+325,12
@@
def process_cfg(_opts, putative_servers, putative_clients):
('peer', 'vrelay'),
('rnets','vnetwork')))
('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:
def catch_termination():
def run_cleanups():
for cleanup in cleanups:
@@
-341,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
@@
-354,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')
@@
-372,6
+380,8
@@
def daemonise():
daemonic_reactor = (twisted.internet.interfaces.IReactorDaemonize
.providedBy(reactor))
if daemonic_reactor: reactor.beforeDaemonize()
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:
rfd, wfd = os.pipe()
childpid = os.fork()
if childpid:
@@
-389,14
+399,14
@@
def daemonise():
grandchildpid = os.fork()
if grandchildpid:
# we are the intermediate child
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)
os._exit(0)
- mypid = os.getpid()
if opts.pidfile is not None:
if opts.pidfile is not None:
- pfh = open(opts.pidfile, 'w')
- print(mypid, file=pfh)
- pfh.close()
-
+ pidfile_h.close()
+
logger = subprocess.Popen(['logger','-d',
'-t','hippotat(stderr)',
'--id=%d' % mypid,
logger = subprocess.Popen(['logger','-d',
'-t','hippotat(stderr)',
'--id=%d' % mypid,
@@
-446,6
+456,12
@@
optparser.add_option('--syslog-facility',
default=None,
help='log to syslog, with specified facility')
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()
common_startup(process_cfg)
catch_termination()
start_http()