diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 20:49:39 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 20:49:39 -0500 |
| commit | b28c7da0a4507825440fd801e1b6dbc5e6a454a7 (patch) | |
| tree | 5b302f5743df9a156dde813554e4c166d5c474c2 /synapse/http | |
| parent | Allow synapse's useragent to be customized (diff) | |
| download | synapse-b28c7da0a4507825440fd801e1b6dbc5e6a454a7.tar.xz | |
Preserve version string in user agent
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/client.py | 6 |
1 files changed, 3 insertions, 3 deletions
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 |