diff --git a/ModemPool.py b/ModemPool.py index dcead14..6187a1c 100644 --- a/ModemPool.py +++ b/ModemPool.py @@ -6,7 +6,7 @@ from serial import Serial from error.SIMError import SIMError from logs.LogSender import LogSender, LOG_ERROR -from params import firebase_store_manager +from params import firebase_store_manager, oracle_log_sender from pojo.SimInfoPojo import SimInfoPojo from utils.excel_reader import ExcelHelper @@ -20,7 +20,7 @@ class ModemPool: self._port_list = port_list self._serial_list = [] self._excel_helper = ExcelHelper() - self._log_sender = LogSender() + self._log_sender = oracle_log_sender self._db_manager = firebase_store_manager for port in self._port_list: diff --git a/logs/LogSender.py b/logs/LogSender.py index 1ef6988..e979d84 100644 --- a/logs/LogSender.py +++ b/logs/LogSender.py @@ -10,6 +10,8 @@ from logs.AppLogging import init_logger LOG_ERROR = "ERROR" LOG_INFO = "INFO" +LOG_APPOINTMENT_ERROR = "APPOINTMENT_ERROR" +LOG_APPOINTMENT_TIMEOUT = "TIMEOUT" class LogSender: diff --git a/main.py b/main.py index bcea0b3..2db5fd7 100644 --- a/main.py +++ b/main.py @@ -10,7 +10,8 @@ from ModemPool import ModemPool from card_pool import CardPool from commandor import Commandor from db.DbManager import DataManager -from params import MODEM_POOL_PORTS, CARD_POOL_PORT, firebase_store_manager +from logs.LogSender import LOG_APPOINTMENT_TIMEOUT +from params import MODEM_POOL_PORTS, CARD_POOL_PORT, firebase_store_manager, oracle_log_sender from pojo.ReserveResultPojo import ReserveResultPojo from utils.excel_reader import ExcelHelper from pojo.serial_modem import SerialModem @@ -81,6 +82,7 @@ def create_modem_for_port(port: str) -> SerialModem: def timeout_occurred(serial_modem: SerialModem): firebase_store_manager.save_timeout_contact(serial_modem.contact) + oracle_log_sender.send_log(serial_modem.contact, type=LOG_APPOINTMENT_TIMEOUT) def start_to_handle_sms(serial_modem: SerialModem): diff --git a/params.py b/params.py index 7b477e9..fc6f9ab 100644 --- a/params.py +++ b/params.py @@ -1,4 +1,5 @@ from db.DbManager import DataManager +from logs.LogSender import LogSender MODEM_POOL_PORTS = [ "/dev/tty.usbmodem11101", @@ -21,4 +22,6 @@ MODEM_POOL_PORTS = [ CARD_POOL_PORT = "/dev/tty.usbmodem12101" firebase_store_manager = DataManager() +oracle_log_sender = LogSender() +