[oar/module/greta] clean logs and print executor cmd output

oar-team · Nov 29, 2023 · ebdf7bb · ebdf7bb
1 parent 15f5591
commit ebdf7bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/oar/modules/almighty.py b/oar/modules/almighty.py
@@ -147,16 +147,11 @@ def check_greta(greta, logger):
     res = tools.check_process(greta.pid, logger)
 
     try:
-        stdout, stderr = greta.communicate(timeout=0)
-        logger.info(f"greta communicated: {stdout}\n{stderr}")
+        greta.communicate(timeout=0)
     except Exception as e:
-        logger.info(f"greta exception: {e}")
+        logger.debug(f"{vars(e)}")
         pass
 
-    # stdout, stderr = greta.communicate(timeout=0)
-    # logger.info(f"greta: {stdout}\n{stderr}")
-
-    logger.info(f"res: {res}")
     return res
 
 

diff --git a/oar/modules/greta.py b/oar/modules/greta.py
@@ -552,8 +552,12 @@ def command_executor(cmd_node, config, logger):
             logger.error("ENERGY_SAVING_NODE_MANAGER_WAKE_UP_CMD is undefined")
         command_to_exec += config["ENERGY_SAVING_NODE_MANAGER_WAKE_UP_CMD"]
 
-    exit_code = tools.call(command_to_exec, shell=True)
-    return exit_code
+    logger.debug(f"Start executor command: {command_to_exec}")
+    result = tools.run(command_to_exec, shell=True, capture_output=True)
+
+    logger.debug(f"called: {result}")
+
+    return result.returncode
 
 
 class WindowForker(object):