From 3f882dcfcd73754d1eacc0d9e15c0bc667498c93 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Tue, 15 Jul 2025 09:41:34 -0700 Subject: [PATCH] fix message.log fixing issue for log in https://github.com/SpudGunMan/meshing-around/pull/161 Co-Authored-By: SudoRand <25190078+sudorand@users.noreply.github.com> --- mesh_bot.py | 5 +++-- pong_bot.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mesh_bot.py b/mesh_bot.py index b14ccd8..38db5a0 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -1224,7 +1224,7 @@ def onReceive(packet, interface): isDM = True # check if the message contains a trap word, DMs are always responded to if (messageTrap(message_string) and not llm_enabled) or messageTrap(message_string.split()[0]): - # log the message to the message log + # log the message to stdout logger.info(f"Device:{rxNode} Channel: {channel_number} " + CustomFormatter.green + f"Received DM: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.purple +\ "From: " + CustomFormatter.white + f"{get_name_from_number(message_from_id, 'long', rxNode)}") # respond with DM @@ -1271,7 +1271,8 @@ def onReceive(packet, interface): time.sleep(responseDelay) # log the message to the message log - msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | " + message_string.replace('\n', '-nl-')) + if log_messages_to_file: + msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | DM | " + message_string.replace('\n', '-nl-')) else: # message is on a channel if messageTrap(message_string): diff --git a/pong_bot.py b/pong_bot.py index 7eef81a..76f5b24 100755 --- a/pong_bot.py +++ b/pong_bot.py @@ -310,7 +310,7 @@ def onReceive(packet, interface): isDM = True # check if the message contains a trap word, DMs are always responded to if (messageTrap(message_string) and not llm_enabled) or messageTrap(message_string.split()[0]): - # log the message to the message log + # log the message to stdout logger.info(f"Device:{rxNode} Channel: {channel_number} " + CustomFormatter.green + f"Received DM: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.purple +\ "From: " + CustomFormatter.white + f"{get_name_from_number(message_from_id, 'long', rxNode)}") # respond with DM @@ -321,7 +321,8 @@ def onReceive(packet, interface): time.sleep(responseDelay) # log the message to the message log - msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | " + message_string.replace('\n', '-nl-')) + if log_messages_to_file: + msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | DM | " + message_string.replace('\n', '-nl-')) else: # message is on a channel if messageTrap(message_string):