elif daddr == c.vaddr or daddr not in c.vnetwork:
lt('inbound')
queue_inbound(ipif, packet)
- elif daddr == c.relay:
+ elif daddr == c.vrelay:
lt('discard relay')
log_discard(packet, iface, saddr, daddr, 'relay')
else:
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)
try: c.server = cfg.get('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)
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')