External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 15:36:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9561 from ryanpetrello/fork-you

Browse Source 
clean stale dispatcher connections closer to post-fork

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-03-11 17:20:56 +00:00
committed by GitHub
parent e8b2072ea5 572c0fbb74
commit 32f02fc91c
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/conf/settings.py
View File

@@ -352,7 +352,6 @@ class SettingsWrapper(UserSettingsHolder):
self.cache.set_many(settings_to_cache, timeout=SETTING_CACHE_TIMEOUT) self.cache.set_many(settings_to_cache, timeout=SETTING_CACHE_TIMEOUT)
def _get_local(self, name, validate=True): def _get_local(self, name, validate=True):
self.__clean_on_fork__()
self._preload_cache() self._preload_cache()
cache_key = Setting.get_cache_key(name) cache_key = Setting.get_cache_key(name)
try: try:

2
awx/main/dispatch/worker/task.py
View File

@@ -6,6 +6,7 @@ import traceback
from kubernetes.config import kube_config from kubernetes.config import kube_config
from django.conf import settings
from django_guid.middleware import GuidMiddleware from django_guid.middleware import GuidMiddleware
from awx.main.tasks import dispatch_startup, inform_cluster_of_shutdown from awx.main.tasks import dispatch_startup, inform_cluster_of_shutdown
@@ -85,6 +86,7 @@ class TaskWorker(BaseWorker):
'task': u'awx.main.tasks.RunProjectUpdate' 'task': u'awx.main.tasks.RunProjectUpdate'
} }
''' '''
settings.__clean_on_fork__()
result = None result = None
try: try:
result = self.run_callable(body) result = self.run_callable(body)