#17 - review log message, standartize format and add location info

amqp/router/router_consumer.py

@@ -7,7 +7,12 @@ from aio_pika.abc import (
     AbstractIncomingMessage,
 )
 from amqp.adapter.amq_route_factory import AMQRouteFactory
-from amqp.adapter.logging_utils import logging_error
+from amqp.adapter.logging_utils import (
+    logging_error,
+    logging_info,
+    logging_debug,
+    logging_warning,
+)
 from amqp.config.amq_configuration import AMQConfiguration
 from amqp.model.model import ServiceMessage, AMQRoute
 from amqp.model.service_message_type import ServiceMessageType
@@ -36,14 +41,14 @@ class RouterConsumer(RouterProducer):
     def __init__(self, configuration: AMQConfiguration):
         super().__init__(configuration)
         self.amqRouteFactory = AMQRouteFactory()
-        logging.info(" [*] RouterConsumer.<init>")
+        logging_info("RouterConsumer.<init>")
 
     async def init_routing_paths_consumer(self, _channel: AbstractRobustChannel):
         """
         * Initialize router according to Consumer mode.
         """
-        logging.info(
-            " [*] RouterConsumer.initConsumerRouter, channel open: %s",
+        logging_info(
+            "RouterConsumer.initConsumerRouter, channel open: %s",
             self.is_open(_channel),
         )
         if self.is_open(_channel):
@@ -64,7 +69,7 @@ class RouterConsumer(RouterProducer):
                 _c_tag = await _queue.consume(
                     callback=self.handle_routing_data_request_message, no_ack=False
                 )
-                logging.info(
+                logging_info(
                     " [%s] RouterConsumer listens for RouteDataRequests on: %s",
                     _c_tag,
                     _cm_request_queue,
@@ -86,8 +91,8 @@ class RouterConsumer(RouterProducer):
         # some debug statements, TODO - remove for prod release
         delivery_tag = message.delivery_tag
         debug = "Delivery.Properties = " + message.properties.__str__()
-        logging.info(
-            " [DBG] ******[%s] (ROUTING_DATA_REQ) tag: %s, env: %s, props: %s",
+        logging_debug(
+            " ******[%s] (ROUTING_DATA_REQ) tag: %s, env: %s, props: %s",
             delivery_tag,
             message.consumer_tag,
             message.properties,
@@ -100,8 +105,8 @@ class RouterConsumer(RouterProducer):
             message.body
         )
         route_mapping: str = self.wrap_own_routes()
-        logging.info(
-            " [DBG] ******[%s] (ROUTING_DATA_REQ) msg=%s, routeMap=[%s]",
+        logging_debug(
+            "******[%s] (ROUTING_DATA_REQ) msg=%s, routeMap=[%s]",
             delivery_tag,
             self.service_message_factory.to_string(cm_message),
             route_mapping,
@@ -130,8 +135,10 @@ class RouterConsumer(RouterProducer):
                         err,
                     )
             else:
-                logging.info(
-                    " [*] ******[%s] (ROUTING_DATA_REQ) [%s] Ignore request originated by ourselves."
+                logging_info(
+                    "******[%s] (ROUTING_DATA_REQ) [%s] Ignore request originated by ourselves.",
+                    delivery_tag,
+                    str(message.body),
                 )
         else:
             logging_error(
@@ -155,10 +162,10 @@ class RouterConsumer(RouterProducer):
                     serviceMessage, self.cm_response_exchange
                 )
                 self.add_own_route(route)
-                logging.info(" [DBG] RouterConsumer registered Route: %s", route)
+                logging_info("RouterConsumer registered Route: %s", route)
             else:
-                logging.warning(
-                    " [W] RouterConsumer couldn't register route data: %s channel isn't open.",
+                logging_warning(
+                    "RouterConsumer couldn't register route data: %s channel isn't open.",
                     CM_RESPONSE_EXCHANGE,
                 )
         except Exception as ioe:
@@ -170,7 +177,7 @@ class RouterConsumer(RouterProducer):
         * :param route: route to remove
         * :return result of remove operation
         """
-        logging.info(" [DBG] RouterConsumer.removeRoute, route: %s", route.as_string())
+        logging_info("RouterConsumer.removeRoute, route: %s", route.as_string())
         try:
             service_message: ServiceMessage = self.service_message_factory.of(
                 ServiceMessageType.ROUTING_DATA_REMOVE, route.as_string(), ANY_RECIPIENT
@@ -178,8 +185,8 @@ class RouterConsumer(RouterProducer):
             if not await self.publish_service_message(
                 service_message, self.cm_response_exchange
             ):
-                logging.warning(
-                    " [W] RouterConsumer couldn't remove current route: %s, channel not open.",
+                logging_warning(
+                    "RouterConsumer couldn't remove current route: %s, channel not open.",
                     route,
                 )
 
@@ -194,8 +201,8 @@ class RouterConsumer(RouterProducer):
         * Cleanup - de-register routes with master.
         """
         routes: Set[AMQRoute] = self.get_routes()
-        logging.info(
-            " [DBG] RouterConsumer.cleanup() [%d]: %s", len(routes), self.wrap_routes()
+        logging_info(
+            "RouterConsumer.cleanup() [%d]: %s", len(routes), self.wrap_routes()
         )
         not_removed = sum(
             1
@@ -203,7 +210,7 @@ class RouterConsumer(RouterProducer):
             if not r
         )
         if not_removed > 0:
-            logging.info(
-                " [W] %d route(s) not removed. self may lead to failed delivery on self route",
+            logging_warning(
+                "%d route(s) not removed. self may lead to failed delivery on self route",
                 not_removed,
             )