NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-02-05 14:56:24 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

#13334: Capture exception class when recording job error

Browse Source
This commit is contained in:
Jeremy Stretch
2023-12-01 10:54:46 -05:00
parent 0340a5e8d6
commit 0c9919a5e8
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netbox/extras/management/commands/runscript.py
+1 -1
View File
@@ -59,7 +59,7 @@ class Command(BaseCommand):
logger.error(f"Exception raised during script execution: {e}")
clear_events.send(request)
job.data = ScriptOutputSerializer(script).data
job.terminate(status=JobStatusChoices.STATUS_ERRORED, error=str(e))
job.terminate(status=JobStatusChoices.STATUS_ERRORED, error=repr(e))
logger.info(f"Script completed in {job.duration}")
netbox/extras/reports.py
+2 -2
View File
@@ -41,7 +41,7 @@ def run_report(job, *args, **kwargs):
try:
report.run(job)
except Exception as e:
job.terminate(status=JobStatusChoices.STATUS_ERRORED, error=str(e))
job.terminate(status=JobStatusChoices.STATUS_ERRORED, error=repr(e))
logging.error(f"Error during execution of report {job.name}")
finally:
# Schedule the next job if an interval has been set
@@ -230,7 +230,7 @@ class Report(object):
stacktrace = traceback.format_exc()
self.log_failure(None, f"An exception occurred: {type(e).__name__}: {e} <pre>{stacktrace}</pre>")
logger.error(f"Exception raised during report execution: {e}")
job.terminate(status=JobStatusChoices.STATUS_ERRORED, error=str(e))
job.terminate(status=JobStatusChoices.STATUS_ERRORED, error=repr(e))
# Perform any post-run tasks
self.post_run()
netbox/extras/scripts.py
+1 -1
View File
@@ -527,7 +527,7 @@ def run_script(data, job, request=None, commit=True, **kwargs):
logger.error(f"Exception raised during script execution: {e}")
script.log_info("Database changes have been reverted due to error.")
job.data = ScriptOutputSerializer(script).data
job.terminate(status=JobStatusChoices.STATUS_ERRORED, error=str(e))
job.terminate(status=JobStatusChoices.STATUS_ERRORED, error=repr(e))
if request:
clear_events.send(request)