tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Allow passing --daemonize to workers

Browse source
This commit is contained in:
Erik Johnston 2019-03-13 17:33:54 +00:00
parent 7998ca3a66
commit 72bfaf746d
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
synapse/config/_base.py
View file

@ -214,14 +214,20 @@ class Config(object):
" Defaults to the directory containing the last config file", " Defaults to the directory containing the last config file",
) )
obj = cls()
obj.invoke_all("add_arguments", config_parser)
config_args = config_parser.parse_args(argv) config_args = config_parser.parse_args(argv)
config_files = find_config_files(search_paths=config_args.config_path) config_files = find_config_files(search_paths=config_args.config_path)
obj = cls()
obj.read_config_files( obj.read_config_files(
config_files, keys_directory=config_args.keys_directory, generate_keys=False config_files, keys_directory=config_args.keys_directory, generate_keys=False
) )
obj.invoke_all("read_arguments", config_args)
return obj return obj
@classmethod @classmethod

4
synapse/config/workers.py
View file

@ -57,3 +57,7 @@ class WorkerConfig(Config):
bind_addresses.append(bind_address) bind_addresses.append(bind_address)
elif not bind_addresses: elif not bind_addresses:
bind_addresses.append('') bind_addresses.append('')
def read_arguments(self, args):
if args.daemonize is not None:
self.worker_daemonize = args.daemonize