~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
process putatives: break out log_ignore
[hippotat]
/
hippotatd
diff --git
a/hippotatd
b/hippotatd
index
212e5c4
..
40f4c69
100755
(executable)
--- a/
hippotatd
+++ b/
hippotatd
@@
-64,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:
@@
-104,7
+104,8
@@
class Client():
def _req_cancel(self, request):
self._log(DBG.HTTP_CTRL, 'cancel', idof=request)
def _req_cancel(self, request):
self._log(DBG.HTTP_CTRL, 'cancel', idof=request)
- request.finish()
+ try: request.finish()
+ except Exception: pass
def _req_error(self, err, request):
self._log(DBG.HTTP_CTRL, 'error %s' % err, idof=request)
def _req_error(self, err, request):
self._log(DBG.HTTP_CTRL, 'error %s' % err, idof=request)
@@
-125,7
+126,7
@@
class Client():
nf = request.notifyFinish()
nf.addErrback(self._req_error, request)
nf.addCallback(self._req_fin, request, cl)
nf = request.notifyFinish()
nf.addErrback(self._req_error, request)
nf.addCallback(self._req_fin, request, cl)
- self._rq.append(
request
)
+ self._rq.append(
(request,nf)
)
self._check_outbound()
def _req_write(self, req, d):
self._check_outbound()
def _req_write(self, req, d):
@@
-135,9
+136,9
@@
class Client():
def _check_outbound(self):
log_debug(DBG.HTTP_CTRL, 'CHKO')
while True:
def _check_outbound(self):
log_debug(DBG.HTTP_CTRL, 'CHKO')
while True:
- try:
request
= self._rq[0]
+ try:
(request,nf)
= self._rq[0]
except IndexError: request = None
except IndexError: request = None
- if request and
request.finish
ed:
+ if request and
nf.call
ed:
self._log(DBG.HTTP_CTRL, 'CHKO req finished, discard', idof=request)
self._rq.popleft()
continue
self._log(DBG.HTTP_CTRL, 'CHKO req finished, discard', idof=request)
self._rq.popleft()
continue
@@
-165,7
+166,7
@@
class Client():
# round again, looking for more to do
while len(self._rq) > self.cc.target_requests_outstanding:
# round again, looking for more to do
while len(self._rq) > self.cc.target_requests_outstanding:
-
request
= self._rq.popleft()
+
(request, nf)
= self._rq.popleft()
self._log(DBG.HTTP, 'CHKO above target, returning empty', idof=request)
request.finish()
self._log(DBG.HTTP, 'CHKO above target, returning empty', idof=request)
request.finish()
@@
-296,9
+297,10
@@
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 = cfg1get('SERVER','server')
+ except NoOptionError: c.server = 'SERVER'
- cfg_process_
common
(c, c.server)
+ cfg_process_
general
(c, c.server)
cfg_process_saddrs(c, c.server)
cfg_process_vnetwork(c, c.server)
cfg_process_vaddr(c, c.server)
cfg_process_saddrs(c, c.server)
cfg_process_vnetwork(c, c.server)
cfg_process_vaddr(c, c.server)
@@
-312,21
+314,24
@@
def process_cfg(_opts, putative_servers, putative_clients):
Client(ci, cc)
try:
Client(ci, cc)
try:
- c.vrelay = cfg
.
get(c.server, 'vrelay')
+ c.vrelay = cfg
1
get(c.server, 'vrelay')
except NoOptionError:
for search in c.vnetwork.hosts():
if search == c.vaddr: continue
c.vrelay = search
break
except NoOptionError:
for search in c.vnetwork.hosts():
if search == c.vaddr: continue
c.vrelay = search
break
+ try: c.ifname = cfg1get(c.server, 'ifname_server', raw=True)
+ except NoOptionError: pass
+
cfg_process_ipif(c,
cfg_process_ipif(c,
- [c.server, '
DEFAULT
'],
+ [c.server, '
COMMON
'],
(('local','vaddr'),
('peer', 'vrelay'),
('rnets','vnetwork')))
if opts.printconfig is not None:
(('local','vaddr'),
('peer', 'vrelay'),
('rnets','vnetwork')))
if opts.printconfig is not None:
- try: val = cfg
.
get(c.server, opts.printconfig)
+ try: val = cfg
1
get(c.server, opts.printconfig)
except NoOptionError: pass
else: print(val)
sys.exit(0)
except NoOptionError: pass
else: print(val)
sys.exit(0)
@@
-361,6
+366,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')
@@
-370,6
+376,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')
@@
-399,16
+409,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,