NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixes #17323: Associate job with script object when executed using runscript command

Browse Source
This commit is contained in:
Jeremy Stretch 2024-09-03 08:55:40 -04:00
parent d18a853baa
commit 814b699204
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
netbox/extras/management/commands/runscript.py
View File

@ -34,7 +34,7 @@ class Command(BaseCommand):
def handle(self, *args, **options): def handle(self, *args, **options):
def _run_script(): def _run_script(script):
""" """
Core script execution task. We capture this within a subfunction to allow for conditionally wrapping it with Core script execution task. We capture this within a subfunction to allow for conditionally wrapping it with
the event_tracking context manager (which is bypassed if commit == False). the event_tracking context manager (which is bypassed if commit == False).
@ -85,7 +85,6 @@ class Command(BaseCommand):
module_name, script_name = script.split('.', 1) module_name, script_name = script.split('.', 1)
module, script = get_module_and_script(module_name, script_name) module, script = get_module_and_script(module_name, script_name)
script = script.python_class
# Take user from command line if provided and exists, other # Take user from command line if provided and exists, other
if options['user']: if options['user']:
@ -102,7 +101,7 @@ class Command(BaseCommand):
stdouthandler.setLevel(logging.DEBUG) stdouthandler.setLevel(logging.DEBUG)
stdouthandler.setFormatter(formatter) stdouthandler.setFormatter(formatter)
logger = logging.getLogger(f"netbox.scripts.{script.full_name}") logger = logging.getLogger(f"netbox.scripts.{script.python_class.full_name}")
logger.addHandler(stdouthandler) logger.addHandler(stdouthandler)
try: try:
@ -118,13 +117,13 @@ class Command(BaseCommand):
raise CommandError(f"Invalid log level: {loglevel}") raise CommandError(f"Invalid log level: {loglevel}")
# Initialize the script form # Initialize the script form
script = script() script_instance = script.python_class()
form = script.as_form(data, None) form = script_instance.as_form(data, None)
# Create the job # Create the job
job = Job.objects.create( job = Job.objects.create(
object=module, object=script,
name=script.class_name, name=script_instance.class_name,
user=user, user=user,
job_id=uuid.uuid4() job_id=uuid.uuid4()
) )
@ -149,7 +148,7 @@ class Command(BaseCommand):
# Execute the script. If commit is True, wrap it with the event_tracking context manager to ensure we process # Execute the script. If commit is True, wrap it with the event_tracking context manager to ensure we process
# change logging, webhooks, etc. # change logging, webhooks, etc.
with event_tracking(request): with event_tracking(request):
_run_script() _run_script(script_instance)
else: else:
logger.error('Data is not valid:') logger.error('Data is not valid:')
for field, errors in form.errors.get_json_data().items(): for field, errors in form.errors.get_json_data().items():