Merge pull request #3425 from ryanpetrello/dispatcher-stop-log

send callback receiver log lines to the correct logger

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

awx/main/dispatch/pool.py

@@ -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):

awx/main/dispatch/worker/base.py

@@ -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()