diff --git a/awx/main/dispatch/worker/base.py b/awx/main/dispatch/worker/base.py index 691028cd42d5..8a8f8dc02afa 100644 --- a/awx/main/dispatch/worker/base.py +++ b/awx/main/dispatch/worker/base.py @@ -162,7 +162,7 @@ def run(self, *args, **kwargs): class AWXConsumerPG(AWXConsumerBase): def __init__(self, *args, schedule=None, **kwargs): super().__init__(*args, **kwargs) - self.pg_max_wait = settings.DISPATCHER_DB_DOWNTIME_TOLERANCE + self.pg_max_wait = getattr(settings, 'DISPATCHER_DB_DOWNTOWN_TOLLERANCE', settings.DISPATCHER_DB_DOWNTIME_TOLERANCE) # if no successful loops have ran since startup, then we should fail right away self.pg_is_down = True # set so that we fail if we get database errors on startup init_time = time.time() diff --git a/awx/main/tasks/callback.py b/awx/main/tasks/callback.py index a8bfc53a4b92..069bc408c97d 100644 --- a/awx/main/tasks/callback.py +++ b/awx/main/tasks/callback.py @@ -29,7 +29,7 @@ def __init__(self, model=None): self.safe_env = {} self.event_ct = 0 self.model = model - self.update_attempts = int(settings.DISPATCHER_DB_DOWNTIME_TOLERANCE / 5) + self.update_attempts = int(getattr(settings, 'DISPATCHER_DB_DOWNTOWN_TOLLERANCE', settings.DISPATCHER_DB_DOWNTIME_TOLERANCE) / 5) self.wrapup_event_dispatched = False self.artifacts_processed = False self.extra_update_fields = {} diff --git a/awx/main/tasks/jobs.py b/awx/main/tasks/jobs.py index d244baa53495..0a9e7f59755b 100644 --- a/awx/main/tasks/jobs.py +++ b/awx/main/tasks/jobs.py @@ -114,7 +114,7 @@ class BaseTask(object): def __init__(self): self.cleanup_paths = [] - self.update_attempts = int(settings.DISPATCHER_DB_DOWNTIME_TOLERANCE / 5) + self.update_attempts = int(getattr(settings, 'DISPATCHER_DB_DOWNTOWN_TOLLERANCE', settings.DISPATCHER_DB_DOWNTIME_TOLERANCE) / 5) self.runner_callback = self.callback_class(model=self.model) def update_model(self, pk, _attempt=0, **updates):