import twisted
from twisted.internet import reactor
-from twisted.logger import LogLevel
import twisted.internet.endpoints
+import twisted.logger
+from twisted.logger import LogLevel
+import twisted.python.constants
+from twisted.python.constants import NamedConstant
import ipaddress
from ipaddress import AddressValueError
import collections
import time
+import codecs
import re as regexp
-from twisted.python.constants import NamedConstant
-
import hippotat.slip as slip
class DBG(twisted.python.constants.Names):
QUEUE = NamedConstant()
QUEUE_CTRL = NamedConstant()
+_hexcodec = codecs.getencoder('hex_codec')
+
+log = twisted.logger.Logger()
+
+def log_debug(dflag, msg, idof=None, d=None):
+ if idof is not None:
+ msg = '[%d] %s' % (id(idof), msg)
+ if d is not None:
+ d = d[0:64]
+ d = _hex_codec(d)[0]
+ msg += ' ' + d
+ log.info('{dflag} {msgcore}', dflag=dflag, msgcore=msg)
+
defcfg = '''
[DEFAULT]
#[<client>] overrides
c = ConfigResults()
def log_discard(packet, saddr, daddr, why):
- print('DROP ', saddr, daddr, why)
+
+ Print('Drop ', Saddr, Daddr, why)
# syslog.syslog(syslog.LOG_DEBUG,
# 'discarded packet %s -> %s (%s)' % (saddr, daddr, why))
self._max_queue_time = max_queue_time
self._pq = collections.deque() # packets
- def _log_debug(self, fn, pri, msg)
- log_debug(pri,
+ def _log(self, dflag, msg, **kwargs)
+ log_debug(dflag, self._desc+' pq: '+msg, **kwargs)
def append(self, packet):
- log_data(DBG.QUEUE, packet, 'pq %s: append' % self._desc)
+ self._log(DBG.QUEUE, 'append', d=packet)
self._pq.append((time.monotonic(), packet))
def nonempty(self):
- log_debug(DBG.QUEUE, 'pq %s: nonempty ?' % self._desc)
+ self._log(DBG.QUEUE, 'nonempty ?')
while True:
try: (queuetime, packet) = self._pq[0]
- except IndexError: return False
+ except IndexError:
+ self._log(DBG.QUEUE, 'nonempty ? empty.')
+ return False
age = time.monotonic() - queuetime
if age > self._max_queue_time:
# strip old packets off the front
+ self._log(DBG.QUEUE, 'dropping (old)', d=packet)
self._pq.popleft()
continue
+ self._log(DBG.QUEUE, 'nonempty ? nonempty.')
return True
def process(self, sizequery, moredata, max_batch):
# sizequery() should return size of batch so far
# moredata(s) should add s to batch
+ self._log(DBG.QUEUE, 'process...')
while True:
try: (dummy, packet) = self._pq[0]
- except IndexError: break
+ except IndexError:
+ self._log(DBG.QUEUE, 'process... empty')
+ break
+
+ self._log(DBG.QUEUE_CTRL, 'process... packet', d=packet)
encoded = slip.encode(packet)
sofar = sizequery()
+ self._log(DBG.QUEUE_CTRL,
+ 'process... (sofar=%d, max=%d) encoded' % (sofar, max_batch),
+ d=encoded
+
if sofar > 0:
if sofar + len(slip.delimiter) + len(encoded) > max_batch:
+ self._log(DBG.QUEUE_CTRL, 'process... overflow')
break
moredata(slip.delimiter)
#---------- startup ----------
def common_startup():
- twisted.logger.globalLogPublisher.addObserver(crash_on_critical)
+ log_formatter = twisted.logger.formatEventAsClassicLogText
+ log_observer = twisted.logger.FileLogObserver(sys.stderr, log_formatter)
+ twisted.logger.globalLogBeginner.beginLoggingTo(
+ [ log_observer, crash_on_critical ]
+ )
optparser.add_option('-c', '--config', dest='configfile',
default='/etc/hippotat/config')
cfg.read(opts.configfile)
def common_run():
+ log_debug(DBG.INIT, 'ready')
reactor.run()
print('CRASHED (end)', file=sys.stderr)