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

Merge pull request #4852 from glennmatthews/gfm-2006-continued

Browse Source 
Some additional fixes to scripts/reports background running (2.9)
This commit is contained in:
Jeremy Stretch
2020-07-20 13:10:56 -04:00
committed by GitHub
parent 8514a5427c d8b0a11a49
commit 08a5e82afc
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/extras/choices.py
View File

@ -101,7 +101,7 @@ class TemplateLanguageChoices(ChoiceSet):
class LogLevelChoices(ChoiceSet): class LogLevelChoices(ChoiceSet):
LOG_DEFAULT = 'default' LOG_DEFAULT = 'default'
LOG_SUCCESS = 'sucess' LOG_SUCCESS = 'success'
LOG_INFO = 'info' LOG_INFO = 'info'
LOG_WARNING = 'warning' LOG_WARNING = 'warning'
LOG_FAILURE = 'failure' LOG_FAILURE = 'failure'

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)