diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 20:52:15 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 20:52:15 -0500 |
| commit | ddd079c8f8127b5ef9f12b1c1d9387bd9f34d74b (patch) | |
| tree | e88b15f55f6b46c19c8f3c4506489723d08b0977 /synapse | |
| parent | Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation" (diff) | |
| parent | Preserve version string in user agent (diff) | |
| download | synapse-ddd079c8f8127b5ef9f12b1c1d9387bd9f34d74b.tar.xz | |
Merge branch 'daniel/useragent' into daniel/3pidinvites
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/server.py | 1 | ||||
| -rw-r--r-- | synapse/http/client.py | 15 |
2 files changed, 10 insertions, 6 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 4d12d49857..5c2d6bfeab 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -26,6 +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_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 0933388c04..5017801773 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -67,7 +67,9 @@ class SimpleHttpClient(object): connectTimeout=15, contextFactory=hs.get_http_client_context_factory() ) - self.version_string = 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 @@ -112,7 +114,7 @@ class SimpleHttpClient(object): uri.encode("ascii"), headers=Headers({ b"Content-Type": [b"application/x-www-form-urlencoded"], - b"User-Agent": [self.version_string], + b"User-Agent": [self.user_agent], }), bodyProducer=FileBodyProducer(StringIO(query_bytes)) ) @@ -131,7 +133,8 @@ class SimpleHttpClient(object): "POST", uri.encode("ascii"), headers=Headers({ - "Content-Type": ["application/json"] + b"Content-Type": [b"application/json"], + b"User-Agent": [self.user_agent], }), bodyProducer=FileBodyProducer(StringIO(json_str)) ) @@ -165,7 +168,7 @@ class SimpleHttpClient(object): "GET", uri.encode("ascii"), headers=Headers({ - b"User-Agent": [self.version_string], + b"User-Agent": [self.user_agent], }) ) @@ -206,7 +209,7 @@ class SimpleHttpClient(object): "PUT", uri.encode("ascii"), headers=Headers({ - b"User-Agent": [self.version_string], + b"User-Agent": [self.user_agent], "Content-Type": ["application/json"] }), bodyProducer=FileBodyProducer(StringIO(json_str)) @@ -241,7 +244,7 @@ class CaptchaServerHttpClient(SimpleHttpClient): bodyProducer=FileBodyProducer(StringIO(query_bytes)), headers=Headers({ b"Content-Type": [b"application/x-www-form-urlencoded"], - b"User-Agent": [self.version_string], + b"User-Agent": [self.user_agent], }) ) |