Adding foreground flag for new-start command in pyros.py

Alexis Koralewski
1 parent dd27c2bc
Showing 1 changed file with 13 additions and 9 deletions Show diff stats
pyros.py
@@ -245,14 +245,17 @@ def die(msg: str = &quot;&quot;):
 # TODO: implement is_async
-def execProcess(command, from_venv=False, is_async=False):
+def execProcess(command, from_venv=False, is_async=False,foreground=False):
     from_venv_str = " from venv ("+VENV_PYTHON+")" if from_venv else ""
     # printFullTerm(Colors.BLUE, "Executing command" + " [" + command + "]" + from_venv_str)
     log.debug("Executing command" + " [" + command + "]" + from_venv_str)
     if from_venv:
         command = VENV_PYTHON+' ' + command
     print(f"EXECUTING {command}")
-    process = subprocess.Popen(command, shell=True)
+    if foreground:
+        process = subprocess.Popen(command, shell=True)
+    else:
+        process = subprocess.Popen(command, shell=True,stdout=subprocess.DEVNULL,stderr=subprocess.STDOUT)
     if is_async:
         # current_processes.append(process)
         return process
@@ -268,15 +271,15 @@ def execProcess(command, from_venv=False, is_async=False):
     return True if process.returncode == 0 else False
-def execProcessFromVenv(command: str, is_async=False):
+def execProcessFromVenv(command: str, is_async=False,foreground=False):
     # return execProcess(command, from_venv=True, is_async)
-    return execProcess(command, True, is_async)
+    return execProcess(command, True, is_async,foreground)
 # TODO: fusionner dans execProcess avec param is_async
-def execProcessFromVenvAsync(command: str):
-    return execProcessFromVenv(command, True)
+def execProcessFromVenvAsync(command: str,foreground=False):
+    return execProcessFromVenv(command, True,foreground)
     """
     args = command.split()
     printFullTerm(
@@ -998,13 +1001,14 @@ def start(agent: str, configfile: str, observatory: str, unit: str, computer_hos
-@pyros_launcher.command(help="Launch an agent")
+@pyros_launcher.command(help="Launch agentSST")
 # @global_test_options
 @click.option('--configfile', '-c', help='the configuration file to be used')
 @click.option('--observatory', '-o', help='the observatory name to be used')
 @click.option('--unit', '-u', help='the unit name to be used')
 @click.option("--computer_hostname","-cp", help="The name of simulated computer hostname")
-def new_start(configfile: str, observatory: str, unit: str, computer_hostname: str):
+@click.option("--foreground","-fg", is_flag=True, help="Print stdout and error in terminal")
+def new_start(configfile: str, observatory: str, unit: str, computer_hostname: str,foreground:bool):
     log.debug("Running start command")
     try:
         from config.pyros.config_pyros import ConfigPyros
@@ -1110,7 +1114,7 @@ def new_start(configfile: str, observatory: str, unit: str, computer_hostname: s
     # Append this process ( [process id, agent_name, result=failure] )
     # ("result" will be updated at the end of execution)
     current_processes.append(
-        [execProcessFromVenvAsync(cmd), agent_name, -1])
+        [execProcessFromVenvAsync(cmd,foreground), agent_name, -1])
     # self.change_dir("..")
     os.chdir(current_dir)