chiark
/
gitweb
/
~ian
/
hippotat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
syslog handling: print tracebacks when logging failure objects
[hippotat.git]
/
hippotatd
diff --git
a/hippotatd
b/hippotatd
index 1865dad819a7231b2b743ac071076ec2b0e2f5e6..b08ce6673d9cd9373a7025a7908f0f3ef3fc0a97 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>.
-#@
sys.path.append(@PYBUILD_INSTALL_DIR@
)
+#@
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
@@
-65,7
+64,7
@@
def route(packet, iface, saddr, daddr):
elif daddr == c.vaddr or daddr not in c.vnetwork:
lt('inbound')
queue_inbound(ipif, packet)
elif daddr == c.vaddr or daddr not in c.vnetwork:
lt('inbound')
queue_inbound(ipif, packet)
- elif daddr == c.relay:
+ elif daddr == c.
v
relay:
lt('discard relay')
log_discard(packet, iface, saddr, daddr, 'relay')
else:
lt('discard relay')
log_discard(packet, iface, saddr, daddr, 'relay')
else:
@@
-297,7
+296,8
@@
def process_cfg(_opts, putative_servers, putative_clients):
global c
c = ConfigResults()
global c
c = ConfigResults()
- c.server = cfg.get('SERVER','server')
+ try: c.server = cfg.get('SERVER','server')
+ except NoOptionError: c.server = 'SERVER'
cfg_process_common(c, c.server)
cfg_process_saddrs(c, c.server)
cfg_process_common(c, c.server)
cfg_process_saddrs(c, c.server)
@@
-320,6
+320,9
@@
def process_cfg(_opts, putative_servers, putative_clients):
c.vrelay = search
break
c.vrelay = search
break
+ try: c.ifname = cfg.get(c.server, 'ifname_server', raw=True)
+ except NoOptionError: pass
+
cfg_process_ipif(c,
[c.server, 'DEFAULT'],
(('local','vaddr'),
cfg_process_ipif(c,
[c.server, 'DEFAULT'],
(('local','vaddr'),
@@
-347,7
+350,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
+365,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')
@@
-369,6
+375,10
@@
def daemonise():
elif level == LogLevel.warn : sl = syslog.LOG_WARNING
else : sl = syslog.LOG_INFO
syslog.syslog(sl,m)
elif level == LogLevel.warn : sl = syslog.LOG_WARNING
else : sl = syslog.LOG_INFO
syslog.syslog(sl,m)
+ failure = event.get('log_failure')
+ if failure is not None:
+ for l in failure.getTraceback().split('\n'):
+ syslog.syslog(sl,l)
glp = twisted.logger.globalLogPublisher
glp.addObserver(emit)
log_debug(DBG.INIT, 'starting to log to syslog')
glp = twisted.logger.globalLogPublisher
glp.addObserver(emit)
log_debug(DBG.INIT, 'starting to log to syslog')
@@
-398,16
+408,15
@@
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',
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,
'-p',opts.syslogfacility + '.err'],
stdin=subprocess.PIPE,
stdout=subprocess.DEVNULL,