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

2014-08-13 15:24:45 +01:00 · 2014-08-13 15:24:45 +01:00 · 6967e93f9c
parent 31f2ec252c b370f9903c
commit 6967e93f9c
1 changed files with 2 additions and 3 deletions
--- 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