Merge branch 'master' of git+ssh://github.com/matrix-org/synapse

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