OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Preserve version string in user agent

pull/292/head
Daniel Wagner-Hall 2015-10-05 20:49:39 -05:00
parent 8fc52bc56a
commit b28c7da0a4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/config/server.py
View File

@ -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", [])

4
synapse/http/client.py
View File

@ -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
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