External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-05 01:59:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

This fixes an issue where various parts of the system could get stuck

Browse Source 
waiting to emit a socketio event if there was a problem with the
websocket service.  Instead of crashing and hanging the system it will
now emit an error and continue.
This commit is contained in:
Matthew Jones
2015-04-21 15:29:37 -04:00
parent 93ecf739be
commit 0fc753046d
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/socket.py
View File

@@ -14,7 +14,7 @@ class Socket(object):
Intended to allow alteration of backend details in a single, consistent Intended to allow alteration of backend details in a single, consistent
way throughout the Tower application. way throughout the Tower application.
""" """
def __init__(self, bucket, rw, debug=0, logger=None): def __init__(self, bucket, rw, debug=0, logger=None, nowait=False):
"""Instantiate a Socket object, which uses ZeroMQ to actually perform """Instantiate a Socket object, which uses ZeroMQ to actually perform
passing a message back and forth. passing a message back and forth.
@@ -42,6 +42,7 @@ class Socket(object):
self._debug = debug self._debug = debug
self._logger = logger self._logger = logger
self._nowait = nowait
def __enter__(self): def __enter__(self):
self.connect() self.connect()
@@ -92,7 +93,10 @@ class Socket(object):
# Okay, create the connection. # Okay, create the connection.
if self._context is None: if self._context is None:
self._context = zmq.Context() self._context = zmq.Context()
self._socket = self._context.socket(self._rw) self._socket = self._context.socket(self._rw)
if self._nowait:
self._socket.setsockopt(zmq.RCVTIMEO, 2000)
self._socket.setsockopt(zmq.LINGER, 1000)
if self._rw == zmq.REQ: if self._rw == zmq.REQ:
self._socket.connect(port) self._socket.connect(port)
else: else:
@@ -134,8 +138,8 @@ class Socket(object):
break break
except Exception as ex: except Exception as ex:
if self._logger: if self._logger:
self._logger.info('Publish Exception: %r; retry=%d', self._logger.error('Publish Exception: %r; retry=%d',
ex, retry, exc_info=True) ex, retry, exc_info=True)
if retry >= 3: if retry >= 3:
raise raise

12
awx/main/utils.py
View File

@@ -24,6 +24,7 @@ from django.utils.encoding import smart_str
# PyCrypto # PyCrypto
from Crypto.Cipher import AES from Crypto.Cipher import AES
logger = logging.getLogger('awx.main.utils')
__all__ = ['get_object_or_400', 'get_object_or_403', 'camelcase_to_underscore', __all__ = ['get_object_or_400', 'get_object_or_403', 'camelcase_to_underscore',
'get_ansible_version', 'get_awx_version', 'update_scm_url', 'get_ansible_version', 'get_awx_version', 'update_scm_url',
@@ -380,10 +381,13 @@ def get_system_task_capacity():
def emit_websocket_notification(endpoint, event, payload): def emit_websocket_notification(endpoint, event, payload):
from awx.main.socket import Socket from awx.main.socket import Socket
with Socket('websocket', 'w') as websocket: try:
payload['event'] = event with Socket('websocket', 'w', nowait=True, logger=logger) as websocket:
payload['endpoint'] = endpoint payload['event'] = event
websocket.publish(payload) payload['endpoint'] = endpoint
websocket.publish(payload)
except Exception as ex:
pass
_inventory_updates = threading.local() _inventory_updates = threading.local()