External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 21:07:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Revert "fix celery task reaper"

Browse Source 
This reverts commit 1359208a99.
This commit is contained in:
Ryan Petrello
2018-06-18 16:18:20 -04:00
parent b4c30576af
commit ef6433c6f9
6 changed files with 19 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
awx/main/tasks.py
View File

@@ -20,7 +20,6 @@ import time
import traceback
import six
import urlparse
import socket
from distutils.version import LooseVersion as Version
import yaml
import fcntl
@@ -232,21 +231,11 @@ def handle_ha_toplogy_worker_ready(sender, **kwargs):
@celeryd_after_setup.connect
def handle_update_celery_hostname(sender, instance, **kwargs):
'''
Celery will appear to infinitely reboot if an error occurs here.
'''
try:
(changed, tower_instance) = Instance.objects.get_or_register()
if changed:
logger.info(six.text_type("Registered tower node '{}'").format(tower_instance.hostname))
system_hostname = socket.gethostname()
if system_hostname != tower_instance.system_hostname:
tower_instance.system_hostname = system_hostname
tower_instance.save(update_fields=['system_hostname'])
logger.warn(six.text_type("Set system hostname to {}").format(tower_instance.system_hostname))
except Exception as e:
logger.error("Error encountered while starting celery and getting system hostname {}".format(e))
raise e
(changed, tower_instance) = Instance.objects.get_or_register()
if changed:
logger.info(six.text_type("Registered tower node '{}'").format(tower_instance.hostname))
instance.hostname = 'celery@{}'.format(tower_instance.hostname)
logger.warn(six.text_type("Set hostname to {}").format(instance.hostname))
@shared_task(queue=settings.CELERY_DEFAULT_QUEUE)