##// END OF EJS Templates
Merge pull request #3600 from chapmanb/master...
Min RK -
r11286:99909aee merge
parent child Browse files
Show More
@@ -1132,7 +1132,15 b' class BatchSystemLauncher(BaseLauncher):'
1132 return job_id
1132 return job_id
1133
1133
1134 def stop(self):
1134 def stop(self):
1135 output = check_output(self.delete_command+[self.job_id], env=os.environ)
1135 try:
1136 p = Popen(self.delete_command+[self.job_id], env=os.environ,
1137 stdout=PIPE, stderr=PIPE)
1138 out, err = p.communicate()
1139 output = out + err
1140 except:
1141 self.log.exception("Problem stopping cluster with command: %s" %
1142 (self.delete_command + [self.job_id]))
1143 output = ""
1136 output = output.decode(DEFAULT_ENCODING, 'replace')
1144 output = output.decode(DEFAULT_ENCODING, 'replace')
1137 self.notify_stop(dict(job_id=self.job_id, output=output)) # Pass the output of the kill cmd
1145 self.notify_stop(dict(job_id=self.job_id, output=output)) # Pass the output of the kill cmd
1138 return output
1146 return output
General Comments 0
You need to be logged in to leave comments. Login now