mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #13369: Fix job termination status for failed reports

Browse Source
This commit is contained in:
Jeremy Stretch
2023-08-03 14:53:58 -04:00
parent a807cca29e
commit 9cc295827b
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/extras/reports.py
View File

@ -214,20 +214,18 @@ class Report(object):
self.active_test = method_name self.active_test = method_name
test_method = getattr(self, method_name) test_method = getattr(self, method_name)
test_method() test_method()
job.data = self._results
if self.failed: if self.failed:
self.logger.warning("Report failed") self.logger.warning("Report failed")
job.status = JobStatusChoices.STATUS_FAILED job.terminate(status=JobStatusChoices.STATUS_FAILED)
else: else:
self.logger.info("Report completed successfully") self.logger.info("Report completed successfully")
job.status = JobStatusChoices.STATUS_COMPLETED job.terminate()
except Exception as e: except Exception as e:
stacktrace = traceback.format_exc() stacktrace = traceback.format_exc()
self.log_failure(None, f"An exception occurred: {type(e).__name__}: {e} <pre>{stacktrace}</pre>") self.log_failure(None, f"An exception occurred: {type(e).__name__}: {e} <pre>{stacktrace}</pre>")
logger.error(f"Exception raised during report execution: {e}") logger.error(f"Exception raised during report execution: {e}")
job.terminate(status=JobStatusChoices.STATUS_ERRORED) job.terminate(status=JobStatusChoices.STATUS_ERRORED)
finally:
job.data = self._results
job.terminate()
# Perform any post-run tasks # Perform any post-run tasks
self.post_run() self.post_run()