From d3b7510c0e8478977c48f1a51a651d79957b48a8 Mon Sep 17 00:00:00 2001 From: Goffi Date: Mon, 25 May 2020 16:15:05 +0200 Subject: [PATCH] core (launcher): extra arguments can now be passed the service with `bg`, `fg` and `dbg`: - `dbg` is an alias for `debug` - extra arguments can be passed to the service, use `-- --help` to see them` --- sat/core/launcher.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sat/core/launcher.py b/sat/core/launcher.py index d70dd88b..4307ef3d 100644 --- a/sat/core/launcher.py +++ b/sat/core/launcher.py @@ -139,22 +139,27 @@ class Launcher: parser = argparse.ArgumentParser(description=f"Launch {self.APP_NAME} backend") parser.set_defaults(cmd=self.cmd_background) subparsers = parser.add_subparsers() + extra_help = f"arguments to pass to {self.APP_NAME} service" bg_parser = subparsers.add_parser( 'background', aliases=['bg'], help=f"run {self.APP_NAME} backend in background (as a daemon)") + bg_parser.add_argument('extra_args', nargs=argparse.REMAINDER, help=extra_help) bg_parser.set_defaults(cmd=self.cmd_background) fg_parser = subparsers.add_parser( 'foreground', aliases=['fg'], help=f"run {self.APP_NAME} backend in foreground") + fg_parser.add_argument('extra_args', nargs=argparse.REMAINDER, help=extra_help) fg_parser.set_defaults(cmd=self.cmd_foreground) dbg_parser = subparsers.add_parser( 'debug', + aliases=['dbg'], help=f"run {self.APP_NAME} backend in debug mode") + dbg_parser.add_argument('extra_args', nargs=argparse.REMAINDER, help=extra_help) dbg_parser.set_defaults(cmd=self.cmd_debug) stop_parser = subparsers.add_parser( @@ -206,6 +211,12 @@ class Launcher: if twistd_opts is not None: server_opts.extend(twistd_opts) server_opts.append(self.APP_NAME_FILE) + if args.extra_args: + try: + args.extra_args.remove('--') + except ValueError: + pass + server_opts.extend(args.extra_args) try: server_options.parseOptions(server_opts) except usage.error as ue: