summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-16 18:35:46 +0000
committerErik Johnston <erik@matrix.org>2014-12-16 18:35:46 +0000
commitf76269392b17d2dbabc85579300d9eef9a559d4e (patch)
tree94036377e17568e6983d6aeb2a73b827a277a580 /synapse/config
parentUse is_outlier() so that we don't get AttributeError (diff)
parentMerge branch 'release-v0.6.0' into develop (diff)
downloadsynapse-f76269392b17d2dbabc85579300d9eef9a559d4e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0
Conflicts:
	synapse/state.py
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/logger.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py
index 089d906fa5..d352ea9be9 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -36,7 +36,7 @@ class LoggingConfig(Config):
             help="The verbosity level."
         )
         logging_group.add_argument(
-            '-f', '--log-file', dest="log_file", default=None,
+            '-f', '--log-file', dest="log_file", default="homeserver.log",
             help="File to log to."
         )
         logging_group.add_argument(