summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-13 13:50:05 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-13 13:50:05 +0100
commit5a59da8a94709e2522da113d75a27bbea2d76cdc (patch)
tree50c628ce129de09bda1f1619e8c9166bfcedd58a /synapse/app
parentAdded a -w flag which will host the web client if specified. Currently this j... (diff)
parentverbose by default please (diff)
downloadsynapse-5a59da8a94709e2522da113d75a27bbea2d76cdc.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse
Diffstat (limited to 'synapse/app')
-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 dcf0b5f287..bbc37dd026 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)