~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
control: demote authbind to Suggests
[hippotat]
/
hippotatd
diff --git
a/hippotatd
b/hippotatd
index
e3e42fb
..
248ea44
100755
(executable)
--- a/
hippotatd
+++ b/
hippotatd
@@
-326,6
+326,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:
@@
-372,6
+378,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
+397,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=pfh)
+ pfh.close()
os._exit(0)
mypid = os.getpid()
os._exit(0)
mypid = os.getpid()
- if opts.pidfile is not None:
- pfh = open(opts.pidfile, 'w')
- print(mypid, file=pfh)
- pfh.close()
-
+ pfh.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
+454,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()