~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "config: Check args after reading config"
[hippotat]
/
hippotatlib
/
__init__.py
diff --git
a/hippotatlib/__init__.py
b/hippotatlib/__init__.py
index
701a5f2
..
e8a502f
100644
(file)
--- a/
hippotatlib/__init__.py
+++ b/
hippotatlib/__init__.py
@@
-562,6
+562,11
@@
def common_startup(process_cfg):
need_defcfg = False
readconfig(value)
need_defcfg = False
readconfig(value)
+ def read_defconfig():
+ readconfig('/etc/hippotat/config.d', False)
+ readconfig('/etc/hippotat/passwords.d', False)
+ readconfig('/etc/hippotat/master.cfg', False)
+
def dfs_less_detailed(dl):
return [df for df in DBG.iterconstants() if df <= dl]
def dfs_less_detailed(dl):
return [df for df in DBG.iterconstants() if df <= dl]
@@
-629,8
+634,7
@@
just `+': all DFLAGs.
if len(args): optparser.error('no non-option arguments please')
if need_defcfg:
if len(args): optparser.error('no non-option arguments please')
if need_defcfg:
- readconfig('/etc/hippotat/config', False)
- readconfig('/etc/hippotat/config.d', False)
+ read_defconfig()
try:
(pss, pcs) = _cfg_process_putatives()
try:
(pss, pcs) = _cfg_process_putatives()
@@
-650,15
+654,16
@@
just `+': all DFLAGs.
stdsomething_obs = twisted.logger.FilteringLogObserver(
stderr_obs, [pred], stdout_obs
)
stdsomething_obs = twisted.logger.FilteringLogObserver(
stderr_obs, [pred], stdout_obs
)
- log_observer = twisted.logger.FilteringLogObserver(
+ global file_log_observer
+ file_log_observer = twisted.logger.FilteringLogObserver(
stdsomething_obs, [LogNotBoringTwisted()]
)
#log_observer = stdsomething_obs
twisted.logger.globalLogBeginner.beginLoggingTo(
stdsomething_obs, [LogNotBoringTwisted()]
)
#log_observer = stdsomething_obs
twisted.logger.globalLogBeginner.beginLoggingTo(
- [ log_observer, crash_on_critical ]
+ [
file_
log_observer, crash_on_critical ]
)
def common_run():
log_debug(DBG.INIT, 'entering reactor')
if not _crashing: reactor.run()
)
def common_run():
log_debug(DBG.INIT, 'entering reactor')
if not _crashing: reactor.run()
- print('
CRASHED (end)
', file=sys.stderr)
+ print('
ENDED
', file=sys.stderr)