From cda29f7b1683961566779d08e7727dfc207b645e Mon Sep 17 00:00:00 2001
From: SpudGunMan <kellykeeton@yahoo.com>
Date: Wed, 7 Aug 2024 11:55:54 -0700
Subject: [PATCH] enhance file log

---
 mesh_bot.py | 6 +++---
 pong_bot.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mesh_bot.py b/mesh_bot.py
index 1945010..4f6e9a9 100755
--- a/mesh_bot.py
+++ b/mesh_bot.py
@@ -259,7 +259,7 @@ def onReceive(packet, interface):
                     # respond with welcome message on DM
                     logger.warning(f"Device:{rxNode} Ignoring DM: {message_string} From: {get_name_from_number(message_from_id, 'long', rxNode)}")
                     send_message(welcome_message, channel_number, message_from_id, rxNode)
-                    msgLogger.info(f"{get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}")
+                    msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}")
             else:
                 # message is on a channel
                 if messageTrap(message_string):
@@ -308,12 +308,12 @@ def onReceive(packet, interface):
                             elif rxNode == 2:
                                 logger.debug(f"Repeating message on Device1 Channel:{channel_number}")
                                 send_message(rMsg, channel_number, 0, 1)
-                        msgLogger.info(f"{get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}")
+                        msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}")
                     else: 
                         # nothing to do for us
                         logger.info(f"Ignoring incoming Device:{rxNode} Channel:{channel_number} " + CustomFormatter.green + "Message:" + CustomFormatter.white +\
                                      f" {message_string} " + CustomFormatter.purple + "From:" + CustomFormatter.white + f" {get_name_from_number(message_from_id)}")
-                        msgLogger.info(f"{get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}")
+                        msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}")
     except KeyError as e:
         logger.critical(f"System: Error processing packet: {e} Device:{rxNode}")
         print(packet) # print the packet for debugging
diff --git a/pong_bot.py b/pong_bot.py
index 265a919..d1c2209 100755
--- a/pong_bot.py
+++ b/pong_bot.py
@@ -151,7 +151,7 @@ def onReceive(packet, interface):
                     # respond with welcome message on DM
                     logger.warning(f"Device:{rxNode} Ignoring DM: {message_string} From: {get_name_from_number(message_from_id, 'long', rxNode)}")
                     send_message(welcome_message, channel_number, message_from_id, rxNode)
-                    msgLogger.info(f"{get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}")
+                    msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}")
             else:
                 # message is on a channel
                 if messageTrap(message_string):
@@ -204,7 +204,7 @@ def onReceive(packet, interface):
                          # nothing to do for us
                         logger.info(f"Ignoring incoming Device:{rxNode} Channel:{channel_number} " + CustomFormatter.green + "Message:" + CustomFormatter.white +\
                                      f" {message_string} " + CustomFormatter.purple + "From:" + CustomFormatter.white + f" {get_name_from_number(message_from_id)}")
-                        msgLogger.info(f"{get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}")
+                        msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}")
     except KeyError as e:
         logger.critical(f"System: Error processing packet: {e} Device:{rxNode}")
         print(packet) # print the packet for debugging