Only log debug messages when enabled

pull/135/head
Fabian Elsner 2023-02-07 14:51:30 +01:00 zatwierdzone przez Florian Ludwig
rodzic 604c45ca7a
commit d03dea0d05
1 zmienionych plików z 25 dodań i 18 usunięć

Wyświetl plik

@ -909,7 +909,8 @@ class Broker:
async def _run_broadcast(self, running_tasks: deque): async def _run_broadcast(self, running_tasks: deque):
broadcast = await self._broadcast_queue.get() 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: for k_filter in self._subscriptions:
if broadcast["topic"].startswith("$") and ( if broadcast["topic"].startswith("$") and (
@ -934,14 +935,16 @@ class Broker:
await self._retain_broadcast_message(broadcast, qos, target_session) await self._retain_broadcast_message(broadcast, qos, target_session)
continue continue
self.logger.debug( if self.logger.isEnabledFor(logging.DEBUG):
"broadcasting application message from %s on topic '%s' to %s" 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=broadcast["session"]),
format_client_message(session=target_session), broadcast["topic"],
format_client_message(session=target_session),
)
) )
)
handler = self._get_handler(target_session) handler = self._get_handler(target_session)
task = asyncio.ensure_future( task = asyncio.ensure_future(
handler.mqtt_publish( handler.mqtt_publish(
@ -954,12 +957,14 @@ class Broker:
running_tasks.append(task) running_tasks.append(task)
async def _retain_broadcast_message(self, broadcast, qos, target_session): async def _retain_broadcast_message(self, broadcast, qos, target_session):
self.logger.debug( if self.logger.isEnabledFor(logging.DEBUG):
"retaining application message from %s on topic '%s' to client '%s'", self.logger.debug(
format_client_message(session=broadcast["session"]), "retaining application message from %s on topic '%s' to client '%s'",
broadcast["topic"], format_client_message(session=broadcast["session"]),
format_client_message(session=target_session), broadcast["topic"],
) format_client_message(session=target_session),
)
retained_message = RetainedApplicationMessage( retained_message = RetainedApplicationMessage(
broadcast["session"], broadcast["session"],
broadcast["topic"], broadcast["topic"],
@ -967,10 +972,12 @@ class Broker:
qos, qos,
) )
await target_session.retained_messages.put(retained_message) await target_session.retained_messages.put(retained_message)
self.logger.debug(
"target_session.retained_messages=%s", if self.logger.isEnabledFor(logging.DEBUG):
target_session.retained_messages.qsize(), self.logger.debug(
) "target_session.retained_messages=%s",
target_session.retained_messages.qsize(),
)
async def _shutdown_broadcast_loop(self): async def _shutdown_broadcast_loop(self):
if self._broadcast_task: if self._broadcast_task: