diff --git a/src/drunc/unified_shell/commands.py b/src/drunc/unified_shell/commands.py index 37d3c68eb..b65c9dc7c 100644 --- a/src/drunc/unified_shell/commands.py +++ b/src/drunc/unified_shell/commands.py @@ -12,7 +12,11 @@ @click.command("boot") -@click.option("--override-logs/--no-override-logs", default=True) +@click.option( + "--override-logs/--no-override-logs", + default=None, + help="Manual override allows for overwriting logs or not, by appending timestamp info. Default (None) is to follow what is used in the initialisation of the unified shell.", +) @click.option( "--sleep-between-app-boot", type=float, @@ -22,7 +26,7 @@ @click.pass_obj def boot( obj: ProcessManagerContext, - override_logs: bool, + override_logs: bool | None, sleep_between_app_boot: int | float = 0, ) -> None: log = get_logger("unified_shell.boot") @@ -32,6 +36,10 @@ def boot( ProcessQuery(user=user, session=session_name) ) + if override_logs is None: + override_logs_boot = obj.override_logs + else: + override_logs_boot = override_logs if len(processes.values) > 0: click.confirm( f"You already have {len(processes.values)} processes running in session {session_name}, are you sure you want to boot a session?", @@ -45,7 +53,7 @@ def boot( user=user, session_name=session_name, log_level="INFO", # Unused anyway !! - override_logs=override_logs, + override_logs=override_logs_boot, sleep_between_app_boot=sleep_between_app_boot, ) for result in results: diff --git a/src/drunc/unified_shell/context.py b/src/drunc/unified_shell/context.py index e7d68e349..318983739 100644 --- a/src/drunc/unified_shell/context.py +++ b/src/drunc/unified_shell/context.py @@ -23,6 +23,7 @@ def __init__(self): self.configuration_file = "" self.configuration_id = "" self.session_name = "" + self.override_logs = True self.running_mode = UnifiedShellMode.INTERACTIVE super(UnifiedShellContext, self).__init__() diff --git a/src/drunc/unified_shell/shell.py b/src/drunc/unified_shell/shell.py index 231d95001..23a4cb189 100644 --- a/src/drunc/unified_shell/shell.py +++ b/src/drunc/unified_shell/shell.py @@ -204,6 +204,7 @@ def unified_shell( port = mp.Value("i", 0) unified_shell_log.debug("[green]Process manager[/green] starting") + ctx.obj.override_logs = override_logs ctx.obj.pm_process = mp.Process( target=run_pm, kwargs={