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

use the correct logger for the callback receiver

Browse Source 
the callback receiver and dispatcher share several modules, so add logic
to use the correct logger
This commit is contained in:
Ryan Petrello 2019-03-15 08:08:32 -04:00
parent c6ae7d84a2
commit 32ee9838af
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/dispatch/pool.py
View File

@ -1,6 +1,7 @@
import logging
import os
import random
import sys
import traceback
from uuid import uuid4
@ -18,7 +19,10 @@ import psutil
from awx.main.models import UnifiedJob
from awx.main.dispatch import reaper
logger = logging.getLogger('awx.main.dispatch')
if 'run_callback_receiver' in sys.argv:
logger = logging.getLogger('awx.main.commands.run_callback_receiver')
else:
logger = logging.getLogger('awx.main.dispatch')
class PoolWorker(object):

8
awx/main/dispatch/worker/base.py
View File

@ -4,6 +4,7 @@
import os
import logging
import signal
import sys
from uuid import UUID
from queue import Empty as QueueEmpty
@ -13,7 +14,10 @@ from kombu.mixins import ConsumerMixin
from awx.main.dispatch.pool import WorkerPool
logger = logging.getLogger('awx.main.dispatch')
if 'run_callback_receiver' in sys.argv:
logger = logging.getLogger('awx.main.commands.run_callback_receiver')
else:
logger = logging.getLogger('awx.main.dispatch')
def signame(sig):
@ -108,7 +112,7 @@ class AWXConsumer(ConsumerMixin):
def stop(self, signum, frame):
self.should_stop = True # this makes the kombu mixin stop consuming
logger.debug('received {}, stopping'.format(signame(signum)))
logger.warn('received {}, stopping'.format(signame(signum)))
self.worker.on_stop()
raise SystemExit()