summary refs log tree commit diff
path: root/synapse/app/pusher.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-10-02 14:39:30 +0100
committerErik Johnston <erik@matrix.org>2018-10-02 14:39:30 +0100
commit7fa156af8061397f425f23c159b5ef12bf20f830 (patch)
treed1ee85a8436de10c828e7394c1f1afee978ae952 /synapse/app/pusher.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentMerge pull request #3960 from matrix-org/rav/fix_missing_create_event_error (diff)
downloadsynapse-7fa156af8061397f425f23c159b5ef12bf20f830.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/pusher.py')
-rw-r--r--synapse/app/pusher.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py

index 2ec4c7defb..630dcda478 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py
@@ -191,7 +191,7 @@ def start(config_options): "Synapse pusher", config_options ) except ConfigError as e: - sys.stderr.write("\n" + e.message + "\n") + sys.stderr.write("\n" + str(e) + "\n") sys.exit(1) assert config.worker_app == "synapse.app.pusher"