summary refs log tree commit diff
path: root/synapse/app/event_creator.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2018-07-17 15:43:33 +0100
committerDavid Baker <dave@matrix.org>2018-07-17 15:43:33 +0100
commit1d11d9323d1d5eb419cbced9417f58d155c68255 (patch)
tree7b35de324a19d67f7fab5e6bc9c637c9c2253a71 /synapse/app/event_creator.py
parentMerge pull request #3502 from matrix-org/matthew/dinsic-tweak-display-names (diff)
parentchangelog (diff)
downloadsynapse-1d11d9323d1d5eb419cbced9417f58d155c68255.tar.xz
Merge remote-tracking branch 'origin/master' into dinsic
Diffstat (limited to 'synapse/app/event_creator.py')
-rw-r--r--synapse/app/event_creator.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/event_creator.py b/synapse/app/event_creator.py

index 5ca77c0f1a..441467093a 100644 --- a/synapse/app/event_creator.py +++ b/synapse/app/event_creator.py
@@ -138,7 +138,7 @@ class EventCreatorServer(HomeServer): elif listener["type"] == "metrics": if not self.get_config().enable_metrics: logger.warn(("Metrics listener configured, but " - "collect_metrics is not enabled!")) + "enable_metrics is not True!")) else: _base.listen_metrics(listener["bind_addresses"], listener["port"])