diff options
| author | sebres <serg.brester@sebres.de> | 2018-04-03 17:58:17 +0200 |
|---|---|---|
| committer | sebres <serg.brester@sebres.de> | 2018-04-03 17:58:17 +0200 |
| commit | e786dbf132689133c29671871718a97f93b8912a (patch) | |
| tree | 8ed0ed4b9fbfec9ded4bd70721f323d37705feff /fail2ban/helpers.py | |
| parent | 8423f017e71b9d543c3dcc8539c04925456fb92b (diff) | |
| download | fail2ban-e786dbf132689133c29671871718a97f93b8912a.tar.gz | |
New logging parameter `padding`, default enabled, excepting the SYSLOG (for backwards compatibility purposes);
Closes gh-2099.
Diffstat (limited to 'fail2ban/helpers.py')
| -rw-r--r-- | fail2ban/helpers.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fail2ban/helpers.py b/fail2ban/helpers.py index 6a3ed2fd..7d6b5ce2 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', addtime=True): +def getVerbosityFormat(verbosity, fmt=' %(message)s', addtime=True, padding=True): """Custom log format for the verbose runs """ if verbosity > 1: # pragma: no cover @@ -155,6 +155,13 @@ def getVerbosityFormat(verbosity, fmt=' %(message)s', addtime=True): fmt = ' %(thread)X %(levelname)-5.5s' + fmt if addtime: fmt = ' %(asctime)-15s' + fmt + else: # default (not verbose): + fmt = "%(name)-23.23s [%(process)d]: %(levelname)-7s" + fmt + if addtime: + fmt = "%(asctime)s " + fmt + # remove padding if not needed: + if not padding: + fmt = re.sub(r'(?<=\))-?\d+(?:\.\d+)?s', lambda m: 's', fmt) return fmt |