diff options
| author | Max <msuraev@sysmocom.de> | 2018-12-05 13:49:13 +0100 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2018-12-05 15:10:18 +0100 |
| commit | f0f8a352cc836d99128e5d3f41f0b65ef1fe545c (patch) | |
| tree | 8a71b377e9628b841f468c8b5fded88444016a11 /osmopy | |
| parent | 25a8297fe8d9495a8e67d62863a7f0881976d2ad (diff) | |
Trap handlers: always log to stdout
Since the scripts are intended to be used as systemd services, there's
no need in separate logging via syslog: systemd will take care of
properly collecting and storing script output. Hence we can drop extra
options and function parameters.
Change-Id: Ifcad1877d45d43b3a2e617775a1c9b256e190591
Related: SYS#4399
Diffstat (limited to 'osmopy')
| -rw-r--r-- | osmopy/trap_helper.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index d4a3b75..45dc527 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -95,7 +95,7 @@ def reloader(path, script, log, dbg1, dbg2, signum, _): sys.argv.remove(dbg2) os.execl(path, script, *sys.argv[1:]) -def debug_init(name, is_debug, output): +def debug_init(name, is_debug): """ Initialize signal handlers and logging """ @@ -104,9 +104,7 @@ def debug_init(name, is_debug, output): log.setLevel(logging.DEBUG) else: log.setLevel(logging.INFO) - log.addHandler(logging.handlers.SysLogHandler('/dev/log')) - if output: - log.addHandler(logging.StreamHandler(sys.stdout)) + log.addHandler(logging.StreamHandler(sys.stdout)) reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with caller's add_argument() signal.signal(signal.SIGHUP, reboot) |