From 5ffad088009769704c08fd440a2fa8c76c51a469 Mon Sep 17 00:00:00 2001
From: Daniel Lyons <dlyons@nrao.edu>
Date: Thu, 24 Jun 2021 17:43:39 +0000
Subject: [PATCH] Ws 254 messaging bug fix
---
shared/messaging/messaging/router.py | 8 ++++++--
shared/messaging/setup.py | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/shared/messaging/messaging/router.py b/shared/messaging/messaging/router.py
index 844321e54..f075a5b18 100644
--- a/shared/messaging/messaging/router.py
+++ b/shared/messaging/messaging/router.py
@@ -109,8 +109,12 @@ class Router(MessageReceiverIF):
for pattern, callbacks in self.callbacks.items():
# Convert hashable str version of pattern back to dict
dict_pattern = json.loads(pattern)
- msg = message['type'] if hasattr(message, 'type') else message['application']
- logger.debug(f"\nRouter.receive_message > pattern: {dict_pattern}, message: {msg}, matches: {self.matches(pattern, message)}\n")
+ msg_recd = message["type"] if "type" in message.keys() else message["application"]
+
+ logger.debug(
+ f">>> Router.receive_message > pattern: {dict_pattern}, message: {msg_recd}, matches:"
+ f" {self.matches(pattern, message)}\n"
+ )
if self.matches(dict_pattern, message):
# print(f"Router.receive_message> pattern {pattern} matches with message {message}")
diff --git a/shared/messaging/setup.py b/shared/messaging/setup.py
index dba01bff3..fb39e2882 100644
--- a/shared/messaging/setup.py
+++ b/shared/messaging/setup.py
@@ -18,6 +18,7 @@ setup(
url="TBD",
license="GPL",
install_requires=["kombu", "pycapo"],
+ requires=["kombu", "pycapo"],
keywords=[],
packages=["messaging"],
classifiers=["Programming Language :: Python :: 3.8"],
--
GitLab