From d03dea0d059f25592fe11b47301cbca646f0528e Mon Sep 17 00:00:00 2001 From: Fabian Elsner Date: Tue, 7 Feb 2023 14:51:30 +0100 Subject: [PATCH] Only log debug messages when enabled --- amqtt/broker.py | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/amqtt/broker.py b/amqtt/broker.py index 5b5065d..55dd6e0 100644 --- a/amqtt/broker.py +++ b/amqtt/broker.py @@ -909,7 +909,8 @@ class Broker: async def _run_broadcast(self, running_tasks: deque): broadcast = await self._broadcast_queue.get() - self.logger.debug("broadcasting %r", broadcast) + if self.logger.isEnabledFor(logging.DEBUG): + self.logger.debug("broadcasting %r", broadcast) for k_filter in self._subscriptions: if broadcast["topic"].startswith("$") and ( @@ -934,14 +935,16 @@ class Broker: await self._retain_broadcast_message(broadcast, qos, target_session) continue - self.logger.debug( - "broadcasting application message from %s on topic '%s' to %s" - % ( - format_client_message(session=broadcast["session"]), - broadcast["topic"], - format_client_message(session=target_session), + if self.logger.isEnabledFor(logging.DEBUG): + self.logger.debug( + "broadcasting application message from %s on topic '%s' to %s" + % ( + format_client_message(session=broadcast["session"]), + broadcast["topic"], + format_client_message(session=target_session), + ) ) - ) + handler = self._get_handler(target_session) task = asyncio.ensure_future( handler.mqtt_publish( @@ -954,12 +957,14 @@ class Broker: running_tasks.append(task) async def _retain_broadcast_message(self, broadcast, qos, target_session): - self.logger.debug( - "retaining application message from %s on topic '%s' to client '%s'", - format_client_message(session=broadcast["session"]), - broadcast["topic"], - format_client_message(session=target_session), - ) + if self.logger.isEnabledFor(logging.DEBUG): + self.logger.debug( + "retaining application message from %s on topic '%s' to client '%s'", + format_client_message(session=broadcast["session"]), + broadcast["topic"], + format_client_message(session=target_session), + ) + retained_message = RetainedApplicationMessage( broadcast["session"], broadcast["topic"], @@ -967,10 +972,12 @@ class Broker: qos, ) await target_session.retained_messages.put(retained_message) - self.logger.debug( - "target_session.retained_messages=%s", - target_session.retained_messages.qsize(), - ) + + if self.logger.isEnabledFor(logging.DEBUG): + self.logger.debug( + "target_session.retained_messages=%s", + target_session.retained_messages.qsize(), + ) async def _shutdown_broadcast_loop(self): if self._broadcast_task: