[tor-commits] [sbws/master] Merge branch 'bug28761'

[juga at torproject.org]

commit c0f76f21553ef0f5734cf5b9885ef8c883cc0eeb
Merge: cd61cb3 0632a25
Author: juga0 <juga at riseup.net>
Date:   Wed Jan 9 16:59:01 2019 +0000

    Merge branch 'bug28761'

 docs/source/examples/sbws.example.ini | 28 ++++++++++++++++++++++++++++
 docs/source/man_sbws.ini.rst          |  2 ++
 sbws/config.default.ini               | 17 ++++++++++-------
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --cc sbws/config.default.ini
index be8660b,d7c7b79..f666640
--- a/sbws/config.default.ini
+++ b/sbws/config.default.ini
@@@ -107,14 -109,17 +109,15 @@@ to_file_max_bytes = 1048576
  # never rotate the log file.
  to_file_num_backups = 50
  # Level to log at. Debug, info, warning, error, critical.
- level = info
- to_file_level = ${level}
- to_stdout_level = ${level}
- to_syslog_level = ${level}
+ # `level` must be set to the lower of all the handler levels.
+ level = debug
+ to_file_level = debug
+ to_stdout_level = info
+ to_syslog_level = info
  # Format string to use when logging
 -format = %(module)s[%(process)s]: <%(levelname)s> %(message)s
 +format = %(asctime)s %(module)s[%(process)s]: <%(levelname)s> %(message)s
- to_file_format = ${format}
 +to_stdout_format = ${format}
 +to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s
  # verbose formatter useful for debugging
- #format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s
+ to_file_format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s
 -# Not adding %(asctime)s to to stdout since it'll go to syslog when using
 -# systemd, and it'll have already the date.
 -to_stdout_format = ${format}
 -to_syslog_format = ${format}
+