mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-08 11:51:56 +00:00
Access replication_url from the worker config directly
This commit is contained in:
parent
80a1bc7db5
commit
bde13833cb
@ -112,7 +112,7 @@ class PusherServer(HomeServer):
|
|||||||
|
|
||||||
def remove_pusher(self, app_id, push_key, user_id):
|
def remove_pusher(self, app_id, push_key, user_id):
|
||||||
http_client = self.get_simple_http_client()
|
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"
|
url = replication_url + "/remove_pushers"
|
||||||
return http_client.post_json_get_json(url, {
|
return http_client.post_json_get_json(url, {
|
||||||
"remove": [{
|
"remove": [{
|
||||||
@ -166,7 +166,7 @@ class PusherServer(HomeServer):
|
|||||||
def replicate(self):
|
def replicate(self):
|
||||||
http_client = self.get_simple_http_client()
|
http_client = self.get_simple_http_client()
|
||||||
store = self.get_datastore()
|
store = self.get_datastore()
|
||||||
replication_url = self.config.replication_url
|
replication_url = self.worker_config.replication_url
|
||||||
pusher_pool = self.get_pusherpool()
|
pusher_pool = self.get_pusherpool()
|
||||||
clock = self.get_clock()
|
clock = self.get_clock()
|
||||||
|
|
||||||
@ -275,6 +275,7 @@ def setup(worker_name, config_options):
|
|||||||
config.server_name,
|
config.server_name,
|
||||||
db_config=config.database_config,
|
db_config=config.database_config,
|
||||||
config=config,
|
config=config,
|
||||||
|
worker_config=worker_config,
|
||||||
version_string=get_version_string("Synapse", synapse),
|
version_string=get_version_string("Synapse", synapse),
|
||||||
database_engine=database_engine,
|
database_engine=database_engine,
|
||||||
)
|
)
|
||||||
|
@ -98,7 +98,7 @@ class SynchrotronPresence(object):
|
|||||||
self.http_client = hs.get_simple_http_client()
|
self.http_client = hs.get_simple_http_client()
|
||||||
self.store = hs.get_datastore()
|
self.store = hs.get_datastore()
|
||||||
self.user_to_num_current_syncs = {}
|
self.user_to_num_current_syncs = {}
|
||||||
self.syncing_users_url = hs.config.replication_url + "/syncing_users"
|
self.syncing_users_url = hs.worker_config.replication_url + "/syncing_users"
|
||||||
self.clock = hs.get_clock()
|
self.clock = hs.get_clock()
|
||||||
|
|
||||||
active_presence = self.store.take_presence_startup_info()
|
active_presence = self.store.take_presence_startup_info()
|
||||||
@ -306,7 +306,7 @@ class SynchrotronServer(HomeServer):
|
|||||||
def replicate(self):
|
def replicate(self):
|
||||||
http_client = self.get_simple_http_client()
|
http_client = self.get_simple_http_client()
|
||||||
store = self.get_datastore()
|
store = self.get_datastore()
|
||||||
replication_url = self.config.replication_url
|
replication_url = self.worker_config.replication_url
|
||||||
clock = self.get_clock()
|
clock = self.get_clock()
|
||||||
notifier = self.get_notifier()
|
notifier = self.get_notifier()
|
||||||
presence_handler = self.get_presence_handler()
|
presence_handler = self.get_presence_handler()
|
||||||
@ -426,6 +426,7 @@ def start(worker_name, config_options):
|
|||||||
config.server_name,
|
config.server_name,
|
||||||
db_config=config.database_config,
|
db_config=config.database_config,
|
||||||
config=config,
|
config=config,
|
||||||
|
worker_config=worker_config,
|
||||||
version_string=get_version_string("Synapse", synapse),
|
version_string=get_version_string("Synapse", synapse),
|
||||||
database_engine=database_engine,
|
database_engine=database_engine,
|
||||||
application_service_handler=SynchrotronApplicationService(),
|
application_service_handler=SynchrotronApplicationService(),
|
||||||
|
@ -46,10 +46,6 @@ def clobber_with_worker_config(config, worker_config):
|
|||||||
# worker config directly.
|
# worker config directly.
|
||||||
config.event_cache_size = worker_config.event_cache_size
|
config.event_cache_size = worker_config.event_cache_size
|
||||||
|
|
||||||
# TODO: The replication_url should only be accessed within worker specific
|
|
||||||
# code so it really shouldn't need to be clobbered in the main config.
|
|
||||||
config.replication_url = worker_config.replication_url
|
|
||||||
|
|
||||||
|
|
||||||
def read_worker_config(config):
|
def read_worker_config(config):
|
||||||
return Worker(
|
return Worker(
|
||||||
|
Loading…
Reference in New Issue
Block a user