NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-19 11:52:22 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

20878 use database routing when running script

Browse Source
This commit is contained in:
Arthur
2025-11-25 10:33:46 -08:00
parent aac3a51431
commit 701561daa8
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/extras/jobs.py
View File

@@ -2,10 +2,11 @@ import logging
import traceback import traceback
from contextlib import ExitStack from contextlib import ExitStack
from django.db import transaction from django.db import router, transaction
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from core.signals import clear_events from core.signals import clear_events
from dcim.models import Device
from extras.models import Script as ScriptModel from extras.models import Script as ScriptModel
from netbox.jobs import JobRunner from netbox.jobs import JobRunner
from netbox.registry import registry from netbox.registry import registry
@@ -42,7 +43,7 @@ class ScriptJob(JobRunner):
# A script can modify multiple models so need to do an atomic lock on # A script can modify multiple models so need to do an atomic lock on
# both the default database (for non ChangeLogged models) and potentially # both the default database (for non ChangeLogged models) and potentially
# any other database (for ChangeLogged models) # any other database (for ChangeLogged models)
with transaction.atomic(): with transaction.atomic(using=router.db_for_write(Device)):
script.output = script.run(data, commit) script.output = script.run(data, commit)
if not commit: if not commit:
raise AbortTransaction() raise AbortTransaction()
@@ -108,14 +109,15 @@ class ScriptJob(JobRunner):
script.request = request script.request = request
self.logger.debug(f"Request ID: {request.id if request else None}") self.logger.debug(f"Request ID: {request.id if request else None}")
# Execute the script. If commit is True, wrap it with the event_tracking context manager to ensure we process # Execute the script. Always use request processors to set up the execution context (e.g. branch activation).
# change logging, event rules, etc. # The event_tracking context manager is one of the request processors and will be activated regardless of
# the commit flag, but it only records changes when commit=True.
if commit: if commit:
self.logger.info("Executing script (commit enabled)") self.logger.info("Executing script (commit enabled)")
else:
self.logger.warning("Executing script (commit disabled)")
with ExitStack() as stack: with ExitStack() as stack:
for request_processor in registry['request_processors']: for request_processor in registry['request_processors']:
stack.enter_context(request_processor(request)) stack.enter_context(request_processor(request))
self.run_script(script, request, data, commit) self.run_script(script, request, data, commit)
else:
self.logger.warning("Executing script (commit disabled)")
self.run_script(script, request, data, commit)