zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-04 16:01:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

[wsrelay] attempt to standardize logging levels

Browse Source 
This needs some work, but it's a start.

Signed-off-by: Rick Elrod <rick@elrod.me>
This commit is contained in:
Rick Elrod
2022-12-11 01:38:44 -06:00
parent d8e7a2d2ac
commit 7723b9f485
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/wsrelay.py
View File

@@ -62,7 +62,7 @@ class WebsocketRelayConnection:
async def connect(self): async def connect(self):
from awx.main.consumers import WebsocketSecretAuthHelper # noqa from awx.main.consumers import WebsocketSecretAuthHelper # noqa
logger.debug(f"Connection from {self.name} to {self.remote_host} attempt number {attempt}.") logger.debug(f"Connection attempt from {self.name} to {self.remote_host}")
''' '''
Can not put get_channel_layer() in the init code because it is in the init Can not put get_channel_layer() in the init code because it is in the init
@@ -116,7 +116,7 @@ class WebsocketRelayConnection:
try: try:
payload = json.loads(msg.data) payload = json.loads(msg.data)
except json.JSONDecodeError: except json.JSONDecodeError:
logmsg = "Failed to decode broadcast message" logmsg = "Failed to decode message from web node"
if logger.isEnabledFor(logging.DEBUG): if logger.isEnabledFor(logging.DEBUG):
logmsg = "{} {}".format(logmsg, payload) logmsg = "{} {}".format(logmsg, payload)
logger.warning(logmsg) logger.warning(logmsg)
@@ -150,6 +150,7 @@ class WebsocketRelayConnection:
consumer_channel = await self.channel_layer.new_channel() consumer_channel = await self.channel_layer.new_channel()
await self.channel_layer.group_add(group, consumer_channel) await self.channel_layer.group_add(group, consumer_channel)
logger.debug(f"Producer {name} added to group {group} and is now awaiting messages.")
while True: while True:
try: try:
@@ -257,7 +258,7 @@ class WebSocketRelayManager(object):
# Establishes a websocket connection to /websocket/relay on all API servers # Establishes a websocket connection to /websocket/relay on all API servers
while True: while True:
logger.info("Current known hosts: {}".format(self.known_hosts)) # logger.info("Current known hosts: {}".format(self.known_hosts))
future_remote_hosts = self.known_hosts.keys() future_remote_hosts = self.known_hosts.keys()
current_remote_hosts = self.relay_connections.keys() current_remote_hosts = self.relay_connections.keys()
deleted_remote_hosts = set(current_remote_hosts) - set(future_remote_hosts) deleted_remote_hosts = set(current_remote_hosts) - set(future_remote_hosts)
@@ -293,7 +294,6 @@ class WebSocketRelayManager(object):
for h in new_remote_hosts: for h in new_remote_hosts:
stats = stats_mgr.new_remote_host_stats(h) stats = stats_mgr.new_remote_host_stats(h)
logger.debug(f"Starting relay connection to {h}")
relay_connection = WebsocketRelayConnection(name=self.local_hostname, stats=stats, remote_host=self.known_hosts[h]) relay_connection = WebsocketRelayConnection(name=self.local_hostname, stats=stats, remote_host=self.known_hosts[h])
relay_connection.start() relay_connection.start()
self.relay_connections[h] = relay_connection self.relay_connections[h] = relay_connection