Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use set_defaults(func=) style

Browse Source
This commit is contained in:
Erik Johnston 2019-07-15 13:49:18 +01:00
parent fdefb9e29a
commit c8f35d8d38
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
synapse/app/admin_cmd.py
View File

@ -90,15 +90,17 @@ class AdminCmdReplicationHandler(ReplicationClientHandler):
@defer.inlineCallbacks @defer.inlineCallbacks
def export_data_command(hs, user_id, directory): def export_data_command(hs, args):
"""Export data for a user. """Export data for a user.
Args: Args:
user_id (str) hs (HomeServer)
directory (str|None): Directory to write output to. Will create a temp args (argparse.Namespace)
directory if not specified.
""" """
user_id = args.user_id
directory = args.output_directory
res = yield hs.get_handlers().admin_handler.exfiltrate_user_data( res = yield hs.get_handlers().admin_handler.exfiltrate_user_data(
user_id, FileExfiltrationWriter(user_id, directory=directory) user_id, FileExfiltrationWriter(user_id, directory=directory)
) )
@ -129,6 +131,7 @@ def start(config_options):
help="The directory to store the exported data in. Must be emtpy. Defaults" help="The directory to store the exported data in. Must be emtpy. Defaults"
" to creating a temp directory.", " to creating a temp directory.",
) )
export_data_parser.set_defaults(func=export_data_command)
try: try:
config, args = HomeServerConfig.load_config_with_parser(parser, config_options) config, args = HomeServerConfig.load_config_with_parser(parser, config_options)
@ -173,12 +176,6 @@ def start(config_options):
ss.setup() ss.setup()
if args.command == "export-data":
command = lambda: export_data_command(ss, args.user_id, args.output_directory)
else:
# This shouldn't happen.
raise ConfigError("Unknown admin command %s" % (args.command,))
# We use task.react as the basic run command as it correctly handles tearing # We use task.react as the basic run command as it correctly handles tearing
# down the reactor when the deferreds resolve and setting the return value. # down the reactor when the deferreds resolve and setting the return value.
# We also make sure that `_base.start` gets run before we actually run the # We also make sure that `_base.start` gets run before we actually run the
@ -188,7 +185,7 @@ def start(config_options):
def run(_reactor): def run(_reactor):
with LoggingContext("command"): with LoggingContext("command"):
yield _base.start(ss, []) yield _base.start(ss, [])
yield command() yield args.func(ss, args)
_base.start_worker_reactor( _base.start_worker_reactor(
"synapse-admin-cmd", config, run_command=lambda: task.react(run) "synapse-admin-cmd", config, run_command=lambda: task.react(run)