diff options
author | Kegan Dougal <kegan@matrix.org> | 2014-08-13 15:53:44 +0100 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2014-08-13 15:53:44 +0100 |
commit | 38c7e923312047b2c26c6ca3f15a9813159088e7 (patch) | |
tree | 819149e28fe875a9e8ee1fe22a86f4d64cdd4355 /synapse/app/homeserver.py | |
parent | Merge branch 'master' of github.com:matrix-org/synapse (diff) | |
parent | more quickstart fixes (diff) | |
download | synapse-38c7e923312047b2c26c6ca3f15a9813159088e7.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse
Diffstat (limited to 'synapse/app/homeserver.py')
-rw-r--r-- | synapse/app/homeserver.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index bbc37dd026..f89b4652e3 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -88,9 +88,8 @@ def setup_logging(verbosity=0, filename=None, config_path=None): '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(message)s' ) - if not verbosity or verbosity == 0: - level = logging.INFO - elif verbosity == 1: + level = logging.INFO + if verbosity: level = logging.DEBUG # FIXME: we need a logging.WARN for a -q quiet option |