set log source

main.py

@@ -3,6 +3,7 @@ import logging
 import re
 import sys
 import time
+from typing import Union
 
 from gsmmodem import GsmModem
 
@@ -18,7 +19,7 @@ from logs.AppLogging import init_logger
 from utils.message_receiver import MessageReceiver
 
 BAUDRATE = 115200
-OTP_TIMEOUT = 60
+OTP_TIMEOUT = 70
 is_finished = False
 commandor = Commandor()
 
@@ -61,23 +62,26 @@ def execut_USSD_cmd(cmd, ser):
     send_command(cmd, ser)
 
 
-def create_modem_for_port(port: str) -> SerialModem:
+def create_modem_for_port(port: str) -> Union[SerialModem, None]:
     logger.info('Initializing modem... for ' + port)
     # Uncomment the following line to see what the modem is doing:
     init_logger()
-    modem = GsmModem(port)
-    time.sleep(1)
-    modem.connect()
-    number = modem.ownNumber
-    logger.info("The SIM card phone number is:")
-    logger.info(number)
-    cmd = "AT+CCID\r"
-    response = modem.write(cmd, True)
-    ccid = response[0].split(" ")[1].replace("\"", "")
-    logger.info("The SIM card ccid is:" + ccid)
-
-    serial_modem = SerialModem(modem=modem, ccid=ccid)
-    return serial_modem
+    serial_modem = None
+    try:
+        modem = GsmModem(port)
+        time.sleep(1)
+        modem.connect()
+        number = modem.ownNumber
+        logger.info("The SIM card phone number is:")
+        logger.info(number)
+        cmd = "AT+CCID\r"
+        response = modem.write(cmd, True)
+        ccid = response[0].split(" ")[1].replace("\"", "")
+        logger.info("The SIM card ccid is:" + ccid)
+        return SerialModem(modem=modem, ccid=ccid)
+    except Exception as ext:
+        print(ext)
+        return serial_modem
 
 
 def timeout_occurred(serial_modem: SerialModem):
@@ -133,7 +137,9 @@ def select_sim_storage(ser) -> bool:
 def init_modems() -> list:
     modems = []
     for port in get_devices_ports():
-        modems.append(create_modem_for_port(port))
+        serial_modem = create_modem_for_port(port)
+        if serial_modem:
+            modems.append(serial_modem)
     # read the contact, and contact the 2 objects together
     excel_reader = ExcelHelper()
     contacts = excel_reader.read_contacts()
@@ -153,7 +159,7 @@ def on_message_received(ch, method, properties, body):
     result = ReserveResultPojo.from_json(body)
     print(result)
     firebase_store_manager.save(result)
-    oracle_log_sender.send_log(str(result.id), type=LOG_APPOINTMENT_SUCCESS)
+    oracle_log_sender.send_appoint_result(result)
     # set the flag to True
     global is_finished
     is_finished = True
@@ -180,8 +186,8 @@ def read_all_the_phone_number():
 
 
 def start_book():
-    slot_number = 5
-    slot_sum = 6
+    slot_number = 12
+    slot_sum = 31
     for i in range(slot_number, slot_sum + 1):
         card_pool.reset()
         print("will switch to " + str(i))
@@ -200,6 +206,6 @@ if __name__ == '__main__':
     init_logger()
     logger = logging.getLogger()
     logger.addHandler(logging.StreamHandler(stream=sys.stdout))
-    # read_all_the_phone_number()
-    start_listen()
-    start_book()
+    read_all_the_phone_number()
+    # start_listen()
+    # start_book()