NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-20 10:16:42 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Save JobResult even for a script run with commit=False

Browse Source
This commit is contained in:
Glenn Matthews 2020-07-14 10:54:32 -04:00
parent 49c6bee6d7
commit d8b0a11a49
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/extras/scripts.py
View File

@ -415,8 +415,6 @@ def run_script(data, request, commit=True, *args, **kwargs):
try: try:
with transaction.atomic(): with transaction.atomic():
script.output = script.run(**kwargs) script.output = script.run(**kwargs)
job_result.data = ScriptOutputSerializer(script).data
job_result.set_status(JobResultStatusChoices.STATUS_COMPLETED)
if not commit: if not commit:
raise AbortTransaction() raise AbortTransaction()
@ -434,6 +432,10 @@ def run_script(data, request, commit=True, *args, **kwargs):
job_result.set_status(JobResultStatusChoices.STATUS_ERRORED) job_result.set_status(JobResultStatusChoices.STATUS_ERRORED)
finally: finally:
if job_result.status != JobResultStatusChoices.STATUS_ERRORED:
job_result.data = ScriptOutputSerializer(script).data
job_result.set_status(JobResultStatusChoices.STATUS_COMPLETED)
if not commit: if not commit:
# Delete all pending changelog entries # Delete all pending changelog entries
purge_changelog.send(Script) purge_changelog.send(Script)