External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-03 09:48:51 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12260 from AlanCoding/callback_status

Browse Source 
Fix the callback receiver --status command
This commit is contained in:
Alan Rominger
2022-05-24 15:26:02 -04:00
committed by GitHub
parent 997686a2ea 1e6ca01686
commit 8366386126
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/dispatch/worker/callback.py
View File

@@ -6,6 +6,7 @@ import time
import traceback import traceback
from django.conf import settings from django.conf import settings
from django.utils.functional import cached_property
from django.utils.timezone import now as tz_now from django.utils.timezone import now as tz_now
from django.db import DatabaseError, OperationalError, transaction, connection as django_connection from django.db import DatabaseError, OperationalError, transaction, connection as django_connection
from django.db.utils import InterfaceError, InternalError from django.db.utils import InterfaceError, InternalError
@@ -70,7 +71,6 @@ class CallbackBrokerWorker(BaseWorker):
def __init__(self): def __init__(self):
self.buff = {} self.buff = {}
self.pid = os.getpid()
self.redis = redis.Redis.from_url(settings.BROKER_URL) self.redis = redis.Redis.from_url(settings.BROKER_URL)
self.subsystem_metrics = s_metrics.Metrics(auto_pipe_execute=False) self.subsystem_metrics = s_metrics.Metrics(auto_pipe_execute=False)
self.queue_pop = 0 self.queue_pop = 0
@@ -79,6 +79,11 @@ class CallbackBrokerWorker(BaseWorker):
for key in self.redis.keys('awx_callback_receiver_statistics_*'): for key in self.redis.keys('awx_callback_receiver_statistics_*'):
self.redis.delete(key) self.redis.delete(key)
@cached_property
def pid(self):
"""This needs to be obtained after forking, or else it will give the parent process"""
return os.getpid()
def read(self, queue): def read(self, queue):
try: try:
res = self.redis.blpop(self.queue_name, timeout=1) res = self.redis.blpop(self.queue_name, timeout=1)