summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-08-13 15:14:22 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-08-13 15:14:22 +0100
commitb370f9903ce487edb71ae32956b2782f0799283e (patch)
treee690baf93a0f2831d620d4f177774c602d20f468
parentNamespace all the Federation HTTP URLs to /matrix/federation/v1/... (diff)
downloadsynapse-b370f9903ce487edb71ae32956b2782f0799283e.tar.xz
Fix logging verbosity parsing code
-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