summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-08-13 12:06:58 +0100
committerMatthew Hodgson <matthew@matrix.org>2014-08-13 12:06:58 +0100
commit2a0f7541c73569139edb1dd6e0ffc0bff275c816 (patch)
treec8a74c918b5702a8126994e43968537e8b98177b
parentMerge branch 'master' of github.com:matrix-org/synapse (diff)
downloadsynapse-2a0f7541c73569139edb1dd6e0ffc0bff275c816.tar.xz
verbose by default please
-rw-r--r--synapse/app/homeserver.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 9ad8ac7f0e..aaa5c44651 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)