shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity

import os, fixing bug that forced SIGKILL

Browse Source
This commit is contained in:
AlanCoding 2017-08-14 16:51:19 -04:00
parent 5ad29c9081
commit 8be1bea33a
No known key found for this signature in database
GPG Key ID: FD2C3C012A72926B
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/management/commands/run_callback_receiver.py
View File

@ -9,6 +9,7 @@ from multiprocessing import Process
from multiprocessing import Queue as MPQueue
from Queue import Empty as QueueEmpty
from Queue import Full as QueueFull
import os
from kombu import Connection, Exchange, Queue
from kombu.mixins import ConsumerMixin
@ -42,8 +43,7 @@ class CallbackBrokerWorker(ConsumerMixin):
signal.signal(signum, signal.SIG_DFL)
os.kill(os.getpid(), signum) # Rethrow signal, this time without catching it
except Exception:
# TODO: LOG
pass
logger.exception('Error in shutdown_handler')
return _handler
if use_workers:
@ -108,7 +108,7 @@ class CallbackBrokerWorker(ConsumerMixin):
except QueueEmpty:
continue
except Exception as e:
logger.error("Exception on worker thread, restarting: " + str(e))
logger.info("Exception on worker thread, restarting: " + str(e))
continue
try:
if 'job_id' not in body and 'ad_hoc_command_id' not in body: