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

This commit is contained in:
Kegan Dougal 2014-08-13 13:50:05 +01:00
commit 5a59da8a94

View file

@ -89,12 +89,12 @@ def setup_logging(verbosity=0, filename=None, config_path=None):
) )
if not verbosity or verbosity == 0: if not verbosity or verbosity == 0:
level = logging.WARNING
elif verbosity == 1:
level = logging.INFO level = logging.INFO
else: elif verbosity == 1:
level = logging.DEBUG level = logging.DEBUG
# FIXME: we need a logging.WARN for a -q quiet option
logging.basicConfig(level=level, filename=filename, format=log_format) logging.basicConfig(level=level, filename=filename, format=log_format)
else: else:
logging.config.fileConfig(config_path) logging.config.fileConfig(config_path)