sat jobs: use the --logs_paths_in_file option to get the remote log files

diff --git a/commands/job.py b/commands/job.py
index 207c81c314da09b4a7a544d9f936b92f53c5c334..fec177f65d1a82d490c11c94bbe80c19198eb8a1 100644 (file)
--- a/commands/job.py
+++ b/commands/job.py
@@ -139,16 +139,9 @@ def run(args, runner, logger):
     else:
         final_status = "KO"
    
-    logger.write(_("\nCommands: %(status)s (%(valid_result)d/%(nb_products)d)\n\n") % \
+    logger.write(_("\nCommands: %(status)s (%(valid_result)d/%(nb_products)d)\n") % \
         { 'status': src.printcolors.printc(final_status), 
           'valid_result': nb_pass,
           'nb_products': len(commands) }, 3)
     
-    # Print the status and the list of log files
-    logger.write(_("The status and the list of log files "
-                   "used in the command is the following :\n"))
-    logger.write("%i\n" % res, 1)
-    for file_path in logger.l_logFiles:
-        logger.write("%s\n" % file_path, 1)
-    
     return res
\ No newline at end of file

diff --git a/commands/jobs.py b/commands/jobs.py
index 5ad497df7d2deec265bc5f75db668cab22458012..04a238513598757ca1f6a644d5ebb3faef1b7120 100644 (file)
--- a/commands/jobs.py
+++ b/commands/jobs.py
@@ -213,7 +213,7 @@ class job(object):
     '''Class to manage one job
     '''
     def __init__(self, name, machine, application, distribution,
-                 commands, timeout, logger, job_file, after=None):
+                 commands, timeout, config, logger, job_file, after=None):
 
         self.name = name
         self.machine = machine
@@ -221,9 +221,11 @@ class job(object):
         self.timeout = timeout
         self.application = application
         self.distribution = distribution
+        self.config = config
         self.logger = logger
         # The list of log files to download from the remote machine 
         self.remote_log_files = []
+        
         # The remote command status
         # -1 means that it has not been launched, 
         # 0 means success and 1 means fail
@@ -244,14 +246,17 @@ class job(object):
                
         self.commands = commands
         self.command = (os.path.join(self.machine.sat_path, "sat") +
-                        " -v1 job --jobs_config " +
+                        " -l " +
+                        os.path.join(self.machine.sat_path,
+                                     "list_log_files.txt") +
+                        " job --jobs_config " +
                         job_file +
                         " --job " +
                         self.name)
     
     def get_pids(self):
         pids = []
-        cmd_pid = 'ps aux | grep "sat -v1 job --jobs_config" | awk \'{print $2}\''
+        cmd_pid = 'ps aux | grep "' + self.command + '" | awk \'{print $2}\''
         (_, out_pid, _) = self.machine.exec_command(cmd_pid, self.logger)
         pids_cmd = out_pid.readlines()
         pids_cmd = [str(src.only_numbers(pid)) for pid in pids_cmd]
@@ -266,7 +271,7 @@ class job(object):
         '''
         
         pids = self.get_pids()
-        cmd_kill = " ; ".join([("kill -9 " + pid) for pid in pids])
+        cmd_kill = " ; ".join([("kill -2 " + pid) for pid in pids])
         (_, out_kill, err_kill) = self.machine.exec_command(cmd_kill, 
                                                             self.logger)
         return (out_kill, err_kill)
@@ -307,7 +312,40 @@ class job(object):
             self.get_log_files()
         
         return self._has_finished
-    
+          
+    def get_log_files(self):
+        if not self.has_finished():
+            msg = _("Trying to get log files whereas the job is not finished.")
+            self.logger.write(src.printcolors.printcWarning(msg))
+            return
+        
+        tmp_file_path = src.get_tmp_filename(self.config, "list_log_files.txt")
+        self.machine.sftp.get(
+                    os.path.join(self.machine.sat_path, "list_log_files.txt"),
+                    tmp_file_path)
+        
+        fstream_tmp = open(tmp_file_path, "r")
+        file_lines = fstream_tmp.readlines()
+        file_lines = [line.replace("\n", "") for line in file_lines]
+        fstream_tmp.close()
+        os.remove(tmp_file_path)
+        self.res_job = file_lines[0]
+        for job_path_remote in file_lines[1:]:
+            if os.path.basename(os.path.dirname(job_path_remote)) != 'OUT':
+                local_path = os.path.join(os.path.dirname(
+                                                    self.logger.logFilePath),
+                                          os.path.basename(job_path_remote))
+                if not os.path.exists(local_path):
+                    self.machine.sftp.get(job_path_remote, local_path)
+            else:
+                local_path = os.path.join(os.path.dirname(
+                                                    self.logger.logFilePath),
+                                          'OUT',
+                                          os.path.basename(job_path_remote))
+                if not os.path.exists(local_path):
+                    self.machine.sftp.get(job_path_remote, local_path)
+            self.remote_log_files.append(local_path)
+
     def has_failed(self):
         '''Returns True if the job has failed. 
            A job is considered as failed if the machine could not be reached,
@@ -336,31 +374,7 @@ class job(object):
         self.cancelled = True
         self.out = _("This job was not launched because its father has failed.")
         self.err = _("This job was not launched because its father has failed.")
-    
-    def get_log_files(self):
-        if not self.has_finished():
-            msg = _("Trying to get log files whereas the job is not finished.")
-            self.logger.write(src.printcolors.printcWarning(msg))
-            return
-        out_lines = self.out.split("\n")
-        out_lines = [line for line in out_lines if line != '']
-        self.res_job = out_lines[0]
-        for job_path_remote in out_lines[1:]:
-            if os.path.basename(os.path.dirname(job_path_remote)) != 'OUT':
-                local_path = os.path.join(os.path.dirname(
-                                                    self.logger.logFilePath),
-                                          os.path.basename(job_path_remote))
-                if not os.path.exists(local_path):
-                    self.machine.sftp.get(job_path_remote, local_path)
-            else:
-                local_path = os.path.join(os.path.dirname(
-                                                    self.logger.logFilePath),
-                                          'OUT',
-                                          os.path.basename(job_path_remote))
-                if not os.path.exists(local_path):
-                    self.machine.sftp.get(job_path_remote, local_path)
-            self.remote_log_files.append(local_path)
-    
+
     def is_running(self):
         '''Returns True if the job commands are running 
         
@@ -406,8 +420,13 @@ class job(object):
         if not self.machine.successfully_connected(logger):
             self._has_finished = True
             self.out = "N\A"
-            self.err = ("Connection to machine (name : %s, host: %s, port: %s, user: %s) has failed\nUse the log command to get more information." 
-                        % (self.machine.name, self.machine.host, self.machine.port, self.machine.user))
+            self.err = ("Connection to machine (name : %s, host: %s, port:"
+                        " %s, user: %s) has failed\nUse the log command "
+                        "to get more information."
+                        % (self.machine.name,
+                           self.machine.host,
+                           self.machine.port,
+                           self.machine.user))
         else:
             self._T0 = time.time()
             self._stdin, self._stdout, self._stderr = self.machine.exec_command(
@@ -535,6 +554,7 @@ class Jobs(object):
                    distribution,
                    cmmnds,
                    timeout,
+                   self.runner.cfg,
                    self.logger,
                    self.job_file,
                    after = after)

diff --git a/salomeTools.py b/salomeTools.py
index 3860f41f1833bddc85582b33d9010e71b247565e..4a7aa52d2f9997dfd0403f8a9d83eaeae9b06ccc 100755 (executable)
--- a/salomeTools.py
+++ b/salomeTools.py
@@ -285,7 +285,7 @@ class Sat(object):
                                         {"launchedCommand" : launchedCommand})
                     
                     if res is None:
-                        res = 0
+                        res = 1
                     # If the logs_paths_in_file was called, write the result
                     # and log files in the given file path
                     if options.logs_paths_in_file: