Add native environment for products

[tools/sat.git] / src / logger.py

diff --git a/src/logger.py b/src/logger.py
index bf5051ebaaca6f1a15b621280c845d3ffd3f86f3..eb2ee58b283a4b3e5e3a227e301ce1822f23f586 100644 (file)
--- a/src/logger.py
+++ b/src/logger.py
@@ -287,7 +287,7 @@ def show_command_log(logFilePath, cmd, application, notShownCommands):
     # When the command is not in notShownCommands, no need to go further :
     # Do not show
     if cmd in notShownCommands:
-        return False, None
+        return False, None, None
  
     # Get the application of the log file
     try:
@@ -295,22 +295,23 @@ def show_command_log(logFilePath, cmd, application, notShownCommands):
     except Exception as e:
         msg = _("WARNING: the log file %s cannot be read:" % logFilePath)
         sys.stdout.write(printcolors.printcWarning("%s\n%s\n" % (msg, e)))
-        return False, None
+        return False, None, None
 
     if 'application' in logFileXml.xmlroot.keys():
         appliLog = logFileXml.xmlroot.get('application')
+        launched_cmd = logFileXml.xmlroot.find('Site').attrib['launchedCommand']
         # if it corresponds, then the log has to be shown
         if appliLog == application:
-            return True, appliLog
+            return True, appliLog, launched_cmd
         elif application != 'None':
-            return False, appliLog
+            return False, appliLog, launched_cmd
         
-        return True, appliLog
+        return True, appliLog, launched_cmd
     
     if application == 'None':
-            return True, None    
+            return True, None, None
         
-    return False, None
+    return False, None, None
 
 def list_log_file(dirPath, expression):
     '''Find all files corresponding to expression in dirPath
@@ -369,7 +370,7 @@ def update_hat_xml(logDir, application=None, notShownCommands = []):
     # then add it to the xml file
     lLogFile = list_log_file(logDir, log_macro_command_file_expression)
     for filePath, __, date, __, hour, cmd, __ in lLogFile:
-        showLog, cmdAppli = show_command_log(filePath, cmd,
+        showLog, cmdAppli, full_cmd = show_command_log(filePath, cmd,
                                               application, notShownCommands)
         #if cmd not in notShownCommands:
         if showLog:
@@ -379,7 +380,8 @@ def update_hat_xml(logDir, application=None, notShownCommands = []):
                                    attrib = {"date" : date, 
                                              "hour" : hour, 
                                              "cmd" : cmd, 
-                                             "application" : cmdAppli})
+                                             "application" : cmdAppli,
+                                             "full_command" : full_cmd})
     
     # Write the file on the hard drive
     xmlHat.write_tree('hat.xsl')
\ No newline at end of file