diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-06-16 12:44:40 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-06-16 12:44:40 +0100 |
| commit | bde13833cb42fc6e09928ffb4f4efad9244abffa (patch) | |
| tree | d5e2194c45f07c7ab99affa1351fdcec61bd9622 /synapse/app/pusher.py | |
| parent | Comment on what's going on in clobber_with_worker_config (diff) | |
| download | synapse-bde13833cb42fc6e09928ffb4f4efad9244abffa.tar.xz | |
Access replication_url from the worker config directly
Diffstat (limited to 'synapse/app/pusher.py')
| -rw-r--r-- | synapse/app/pusher.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index 6c8c02fb38..a26a3bd394 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -112,7 +112,7 @@ class PusherServer(HomeServer): def remove_pusher(self, app_id, push_key, user_id): http_client = self.get_simple_http_client() - replication_url = self.config.replication_url + replication_url = self.worker_config.replication_url url = replication_url + "/remove_pushers" return http_client.post_json_get_json(url, { "remove": [{ @@ -166,7 +166,7 @@ class PusherServer(HomeServer): def replicate(self): http_client = self.get_simple_http_client() store = self.get_datastore() - replication_url = self.config.replication_url + replication_url = self.worker_config.replication_url pusher_pool = self.get_pusherpool() clock = self.get_clock() @@ -275,6 +275,7 @@ def setup(worker_name, config_options): config.server_name, db_config=config.database_config, config=config, + worker_config=worker_config, version_string=get_version_string("Synapse", synapse), database_engine=database_engine, ) |