signal.signal(signal.SIGINT, signal.SIG_DFL)
import sys
+import os
+
+from zope.interface import implementer
import twisted
from twisted.internet import reactor
class DBG(twisted.python.constants.Names):
INIT = NamedConstant()
+ CONFIG = NamedConstant()
ROUTE = NamedConstant()
DROP = NamedConstant()
FLOW = NamedConstant()
HTTP_FULL = NamedConstant()
CTRL_DUMP = NamedConstant()
SLIP_FULL = NamedConstant()
+ DATA_COMPLETE = NamedConstant()
_hex_codec = codecs.getencoder('hex_codec')
+#---------- logging ----------
+
+org_stderr = sys.stderr
+
log = twisted.logger.Logger()
+debug_set = set()
+debug_def_detail = DBG.HTTP
+
def log_debug(dflag, msg, idof=None, d=None):
- if dflag > DBG.HTTP: return
+ if dflag not in debug_set: return
#print('---------------->',repr((dflag, msg, idof, d)), file=sys.stderr)
if idof is not None:
msg = '[%#x] %s' % (id(idof), msg)
if d is not None:
- #d = d[0:64]
+ trunc = ''
+ if not DBG.DATA_COMPLETE in debug_set:
+ if len(d) > 64:
+ d = d[0:64]
+ trunc = '...'
d = _hex_codec(d)[0].decode('ascii')
- msg += ' ' + d
+ msg += ' ' + d + trunc
log.info('{dflag} {msgcore}', dflag=dflag, msgcore=msg)
+@implementer(twisted.logger.ILogFilterPredicate)
+class LogNotBoringTwisted:
+ def __call__(self, event):
+ yes = twisted.logger.PredicateResult.yes
+ no = twisted.logger.PredicateResult.no
+ try:
+ if event.get('log_level') != LogLevel.info:
+ return yes
+ dflag = event.get('dflag')
+ if dflag in debug_set: return yes
+ if dflag is None and DBG.TWISTED in debug_set: return yes
+ return no
+ except Exception:
+ print(traceback.format_exc(), file=org_stderr)
+ return yes
+
+#---------- default config ----------
+
defcfg = '''
[DEFAULT]
#[<client>] overrides
'''
# these need to be defined here so that they can be imported by import *
-cfg = ConfigParser()
+cfg = ConfigParser(strict=False)
optparser = OptionParser()
_mimetrans = bytes.maketrans(b'-'+slip.esc, slip.esc+b'-')
#---------- startup ----------
def common_startup():
+ re = regexp.compile('#.*')
+ cfg.read_string(re.sub('', defcfg))
+ need_defcfg = True
+
+ def readconfig(pathname, mandatory=True):
+ def log(m, p=pathname):
+ if not DBG.CONFIG in debug_set: return
+ print('DBG.CONFIG: %s: %s' % (m, pathname))
+
+ try:
+ files = os.listdir(pathname)
+
+ except FileNotFoundError:
+ if mandatory: raise
+ log('skipped')
+ return
+
+ except NotADirectoryError:
+ cfg.read(pathname)
+ log('read file')
+ return
+
+ # is a directory
+ log('directory')
+ re = regexp.compile('[^-A-Za-z0-9_]')
+ for f in os.listdir(cdir):
+ if re.search(f): continue
+ subpath = pathname + '/' + f
+ try:
+ os.stat(subpath)
+ except FileNotFoundError:
+ log('entry skipped', subpath)
+ continue
+ cfg.read(subpath)
+ log('entry read', subpath)
+
+ def oc_config(od,os, value, op):
+ nonlocal need_defcfg
+ need_defcfg = False
+ readconfig(value)
+
+ def dfs_less_detailed(dl):
+ return [df for df in DBG.iterconstants() if df <= dl]
+
+ def ds_default(od,os,dl,op):
+ global debug_set
+ debug_set = set(dfs_less_detailed(debug_def_detail))
+
+ def ds_select(od,os, spec, op):
+ for it in spec.split(','):
+
+ if it.startswith('-'):
+ mutator = debug_set.discard
+ it = it[1:]
+ else:
+ mutator = debug_set.add
+
+ if it == '+':
+ dfs = DBG.iterconstants()
+
+ else:
+ if it.endswith('+'):
+ mapper = dfs_less_detailed
+ it = it[0:len(it)-1]
+ else:
+ mapper = lambda x: [x]
+
+ try:
+ dfspec = DBG.lookupByName(it)
+ except ValueError:
+ optparser.error('unknown debug flag %s in --debug-select' % it)
+
+ dfs = mapper(dfspec)
+
+ for df in dfs:
+ mutator(df)
+
+ optparser.add_option('-D', '--debug',
+ nargs=0,
+ action='callback',
+ help='enable default debug (to stdout)',
+ callback= ds_default)
+
+ optparser.add_option('--debug-select',
+ nargs=1,
+ type='string',
+ metavar='[-]DFLAG[+]|[-]+,...',
+ help=
+'''enable (`-': disable) each specified DFLAG;
+`+': do same for all "more interesting" DFLAGSs;
+just `+': all DFLAGs.
+ DFLAGS: ''' + ' '.join([df.name for df in DBG.iterconstants()]),
+ action='callback',
+ callback= ds_select)
+
+ optparser.add_option('-c', '--config',
+ nargs=1,
+ type='string',
+ metavar='CONFIGFILE',
+ dest='configfile',
+ action='callback',
+ callback= oc_config)
+
+ (opts, args) = optparser.parse_args()
+ if len(args): optparser.error('no non-option arguments please')
+
+ if need_defcfg:
+ readconfig('/etc/hippotat/config', False)
+ readconfig('/etc/hippotat/config.d', False)
+
+ #print(repr(debug_set), file=sys.stderr)
+
log_formatter = twisted.logger.formatEventAsClassicLogText
stdout_obs = twisted.logger.FileLogObserver(sys.stdout, log_formatter)
stderr_obs = twisted.logger.FileLogObserver(sys.stderr, log_formatter)
pred = twisted.logger.LogLevelFilterPredicate(LogLevel.error)
- log_observer = twisted.logger.FilteringLogObserver(
+ stdsomething_obs = twisted.logger.FilteringLogObserver(
stderr_obs, [pred], stdout_obs
)
+ log_observer = twisted.logger.FilteringLogObserver(
+ stdsomething_obs, [LogNotBoringTwisted()]
+ )
+ #log_observer = stdsomething_obs
twisted.logger.globalLogBeginner.beginLoggingTo(
[ log_observer, crash_on_critical ]
)
- optparser.add_option('-c', '--config', dest='configfile',
- default='/etc/hippotat/config')
- (opts, args) = optparser.parse_args()
- if len(args): optparser.error('no non-option arguments please')
-
- re = regexp.compile('#.*')
- cfg.read_string(re.sub('', defcfg))
- cfg.read(opts.configfile)
-
def common_run():
log_debug(DBG.INIT, 'entering reactor')
if not _crashing: reactor.run()
~ian / hippotat.git / blobdiff