diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-13 13:50:05 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-13 13:50:05 +0100 |
| commit | 5a59da8a94709e2522da113d75a27bbea2d76cdc (patch) | |
| tree | 50c628ce129de09bda1f1619e8c9166bfcedd58a /synapse/app | |
| parent | Added a -w flag which will host the web client if specified. Currently this j... (diff) | |
| parent | verbose by default please (diff) | |
| download | synapse-5a59da8a94709e2522da113d75a27bbea2d76cdc.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/homeserver.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index dcf0b5f287..bbc37dd026 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -89,12 +89,12 @@ def setup_logging(verbosity=0, filename=None, config_path=None): ) if not verbosity or verbosity == 0: - level = logging.WARNING - elif verbosity == 1: level = logging.INFO - else: + elif verbosity == 1: level = logging.DEBUG + # FIXME: we need a logging.WARN for a -q quiet option + logging.basicConfig(level=level, filename=filename, format=log_format) else: logging.config.fileConfig(config_path) |