From 3668b3c761499a1eadc3e666419f9b9ae6634a70 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Wed, 3 Dec 2014 20:49:08 -0500 Subject: [PATCH] Fix callback consumer port to always be a URL, instead of sometimes an int. --- awx/plugins/callback/job_event_callback.py | 2 +- awx/settings/defaults.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/plugins/callback/job_event_callback.py b/awx/plugins/callback/job_event_callback.py index 00820dfe95..555e80181a 100644 --- a/awx/plugins/callback/job_event_callback.py +++ b/awx/plugins/callback/job_event_callback.py @@ -111,7 +111,7 @@ class CallbackModule(object): def _start_connection(self): self.context = zmq.Context() self.socket = self.context.socket(zmq.REQ) - self.socket.connect(str(self.callback_consumer_port)) + self.socket.connect(self.callback_consumer_port) def _post_job_event_queue_msg(self, event, event_data): self.counter += 1 diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index ffd109faf2..6992983639 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -493,7 +493,7 @@ else: INTERNAL_API_URL = 'http://127.0.0.1:8000' # ZeroMQ callback settings. -CALLBACK_CONSUMER_PORT = 5556 +CALLBACK_CONSUMER_PORT = "tcp://127.0.0.1:5556" CALLBACK_QUEUE_PORT = "ipc:///tmp/callback_receiver.ipc" TASK_COMMAND_PORT = 6559