diff options
| author | sebres <info@sebres.de> | 2017-11-26 23:03:29 +0100 |
|---|---|---|
| committer | sebres <info@sebres.de> | 2017-11-26 23:03:29 +0100 |
| commit | f31195a4fc1acc346268220e02cd79d572dea16f (patch) | |
| tree | b64a8385025aebb794072fed141df5b5024c23df /fail2ban/helpers.py | |
| parent | 100b531affe5bb3e6b3ee8f1aa59d3a1f5a74aeb (diff) | |
| download | fail2ban-f31195a4fc1acc346268220e02cd79d572dea16f.tar.gz | |
added new logtarget "SYSOUT" to log from fail2ban working in foreground as systemd-service (in opposite to "STDOUT" don't log time-stamps).
Diffstat (limited to 'fail2ban/helpers.py')
| -rw-r--r-- | fail2ban/helpers.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fail2ban/helpers.py b/fail2ban/helpers.py index 7eaa59f8..5b027b32 100644 --- a/fail2ban/helpers.py +++ b/fail2ban/helpers.py @@ -143,7 +143,7 @@ def str2LogLevel(value): raise ValueError("Invalid log level %r" % value) return ll -def getVerbosityFormat(verbosity, fmt=' %(message)s'): +def getVerbosityFormat(verbosity, fmt=' %(message)s', addtime=True): """Custom log format for the verbose runs """ if verbosity > 1: # pragma: no cover @@ -152,7 +152,9 @@ def getVerbosityFormat(verbosity, fmt=' %(message)s'): if verbosity > 2: fmt = ' +%(relativeCreated)5d %(thread)X %(name)-25.25s %(levelname)-5.5s' + fmt else: - fmt = ' %(asctime)-15s %(thread)X %(levelname)-5.5s' + fmt + fmt = ' %(thread)X %(levelname)-5.5s' + fmt + if addtime: + fmt = ' %(asctime)-15s' + fmt return fmt |