summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-08-13 15:24:45 +0100
committerMatthew Hodgson <matthew@matrix.org>2014-08-13 15:24:45 +0100
commit6967e93f9cb63b9ccc202946749406768a27e884 (patch)
treef8d15badaf236266c1a85d4b8e1ebc654f3e0c54 /synapse
parentrefactor the README a load more to make the quickstart more visible (diff)
parentFix logging verbosity parsing code (diff)
downloadsynapse-6967e93f9cb63b9ccc202946749406768a27e884.tar.xz
Merge branch 'master' of git+ssh://github.com/matrix-org/synapse
Diffstat (limited to 'synapse')
-rw-r--r--synapse/app/homeserver.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index aaa5c44651..5e126bc87e 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