2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 50c4afdcfe..5c2d6bfeab 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -26,7 +26,7 @@ class ServerConfig(Config):
self.soft_file_limit = config["soft_file_limit"]
self.daemonize = config.get("daemonize")
self.print_pidfile = config.get("print_pidfile")
- self.user_agent_override = config.get("user_agent_override")
+ self.user_agent_suffix = config.get("user_agent_suffix")
self.use_frozen_dicts = config.get("use_frozen_dicts", True)
self.listeners = config.get("listeners", [])
diff --git a/synapse/http/client.py b/synapse/http/client.py
index 6adf35c7bf..5017801773 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -67,9 +67,9 @@ class SimpleHttpClient(object):
connectTimeout=15,
contextFactory=hs.get_http_client_context_factory()
)
- self.user_agent = hs.config.user_agent_override
- if self.user_agent is None:
- self.user_agent = hs.version_string
+ self.user_agent = hs.version_string
+ if hs.config.user_agent_suffix:
+ self.user_agent += " - " + hs.config.user_agent_suffix
def request(self, method, uri, *args, **kwargs):
# A small wrapper around self.agent.request() so we can easily attach
|
