Skip to content
Snippets Groups Projects
Commit 6229f0e7 authored by Nathan Hertz's avatar Nathan Hertz
Browse files

Corrected -1 exit code message; added default exit code message

parent f3d58e9e
No related branches found
No related tags found
No related merge requests found
......@@ -34,7 +34,9 @@ class MockLogger:
else:
event_body = "\t" + event_body
footer = "..."
self.logger.info(msg="\n".join([header, event_body, footer])) if event_body else self.logger.info("\n".join([header, footer]))
self.logger.info(
msg="\n".join([header, event_body, footer])
) if event_body else self.logger.info("\n".join([header, footer]))
@staticmethod
def create_header(event_type: WorkflowEventType) -> str:
......@@ -69,8 +71,10 @@ class Job:
self.fields, self.command = self.parse(file)
self.write_log = write_log
if self.write_log:
self.logger = MockLogger(self.fields.get('log', "./condor.log"))
self.logger.log_event(WorkflowEventType.SUBMITTED, f"Job node: {self.fields['executable']}")
self.logger = MockLogger(self.fields.get("log", "./condor.log"))
self.logger.log_event(
WorkflowEventType.SUBMITTED, f"Job node: {self.fields['executable']}"
)
def parse(self, file: Path) -> NamedTuple:
"""
......@@ -106,12 +110,13 @@ class Job:
def execute(self):
result_strings = {
0: "Normal termination (return value 0)",
-1: "Error in execution (return value -1)",
# This is 255 instead of -1 because that's what subprocess returns instead of -1
255: "Error in execution (return value -1)",
}
if self.write_log:
self.logger.log_event(WorkflowEventType.EXECUTING)
retval = subprocess.call([self.fields["executable"], self.fields["arguments"]])
exec_results = f"{result_strings[retval]}"
process = subprocess.run([self.fields["executable"], self.fields["arguments"]])
exec_results = f"{result_strings.get(process.returncode, f'Something weird happened (return value {process.returncode})')}"
if self.write_log:
self.logger.log_event(WorkflowEventType.TERMINATED, exec_results)
......
executable = null
arguments = -g
queue
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment