diff --git a/db_handler.py b/db_handler.py index 53c3559..0989836 100644 --- a/db_handler.py +++ b/db_handler.py @@ -1,6 +1,7 @@ import sqlite3 import time from datetime import datetime +import logging import globals import default_config as config @@ -45,10 +46,10 @@ def save_message_to_db(channel, user_id, message_text): return timestamp except sqlite3.Error as e: - print(f"SQLite error in save_message_to_db: {e}") + logging.error(f"SQLite error in save_message_to_db: {e}") except Exception as e: - print(f"Unexpected error in save_message_to_db: {e}") + logging.error(f"Unexpected error in save_message_to_db: {e}") def update_ack_nak(channel, timestamp, message, ack): try: @@ -66,10 +67,10 @@ def update_ack_nak(channel, timestamp, message, ack): db_connection.commit() except sqlite3.Error as e: - print(f"SQLite error in update_ack_nak: {e}") + logging.error(f"SQLite error in update_ack_nak: {e}") except Exception as e: - print(f"Unexpected error in update_ack_nak: {e}") + logging.error(f"Unexpected error in update_ack_nak: {e}") from datetime import datetime @@ -142,10 +143,10 @@ def load_messages_from_db(): globals.all_messages[channel].extend(messages) except sqlite3.Error as e: - print(f"SQLite error while loading messages from table '{table_name}': {e}") + logging.error(f"SQLite error while loading messages from table '{table_name}': {e}") except sqlite3.Error as e: - print(f"SQLite error in load_messages_from_db: {e}") + logging.error(f"SQLite error in load_messages_from_db: {e}") def init_nodedb(): @@ -197,9 +198,9 @@ def init_nodedb(): db_connection.commit() except sqlite3.Error as e: - print(f"SQLite error in init_nodedb: {e}") + logging.error(f"SQLite error in init_nodedb: {e}") except Exception as e: - print(f"Unexpected error in init_nodedb: {e}") + logging.error(f"Unexpected error in init_nodedb: {e}") def maybe_store_nodeinfo_in_db(packet): """Save nodeinfo unless that record is already there.""" @@ -281,6 +282,6 @@ def maybe_store_nodeinfo_in_db(packet): except sqlite3.Error as e: - print(f"SQLite error in maybe_store_nodeinfo_in_db: {e}") + logging.error(f"SQLite error in maybe_store_nodeinfo_in_db: {e}") finally: db_connection.close() diff --git a/message_handlers/rx_handler.py b/message_handlers/rx_handler.py index ae709da..21a6b63 100644 --- a/message_handlers/rx_handler.py +++ b/message_handlers/rx_handler.py @@ -1,9 +1,10 @@ +import logging +import time from meshtastic import BROADCAST_NUM from utilities.utils import get_node_list, decimal_to_hex, get_name_from_number import globals from ui.curses_ui import draw_packetlog_win, draw_node_list, draw_messages_window, draw_channel_list, add_notification from db_handler import save_message_to_db, maybe_store_nodeinfo_in_db -import time import default_config as config @@ -100,4 +101,4 @@ def on_receive(packet, interface): save_message_to_db(globals.channel_list[channel_number], message_from_id, message_string) except KeyError as e: - print(f"Error processing packet: {e}") \ No newline at end of file + logging.error(f"Error processing packet: {e}") \ No newline at end of file diff --git a/utilities/interfaces.py b/utilities/interfaces.py index 4111d8c..7e6e821 100644 --- a/utilities/interfaces.py +++ b/utilities/interfaces.py @@ -1,6 +1,5 @@ -import meshtastic.serial_interface -import meshtastic.tcp_interface -import meshtastic.ble_interface +import logging +import meshtastic.serial_interface, meshtastic.tcp_interface, meshtastic.ble_interface import globals def initialize_interface(args): @@ -12,6 +11,6 @@ def initialize_interface(args): try: return meshtastic.serial_interface.SerialInterface(args.port) except PermissionError as ex: - print("You probably need to add yourself to the `dialout` group to use a serial connection.") + logging.error("You probably need to add yourself to the `dialout` group to use a serial connection.") if globals.interface.devPath is None: return meshtastic.tcp_interface.TCPInterface("meshtastic.local") \ No newline at end of file