From dbfbf73cdd7478be16025d8e907e2cf857dd9cd4 Mon Sep 17 00:00:00 2001
From: Lei PAN <panleicim@gmail.com>
Date: Tue, 19 Apr 2022 18:59:44 +0200
Subject: [PATCH] inscrease network timeout

---
 logs/LogSender.py   |  2 +-
 main.py             |  2 +-
 modems/card_pool.py | 12 ---------
 params.py           | 66 ++++++++++++++++++++++-----------------------
 scheduler.py        |  4 +--
 5 files changed, 37 insertions(+), 49 deletions(-)

diff --git a/logs/LogSender.py b/logs/LogSender.py
index d9c9970..7aa23cb 100644
--- a/logs/LogSender.py
+++ b/logs/LogSender.py
@@ -35,7 +35,7 @@ class LogSender:
     def __init__(self):
         self._config = oci.config.from_file("~/.oci/logger_config_appointment")
         self._identity = oci.identity.IdentityClient(self._config)
-        self._loggingingestion_client = LoggingClient(self._config)
+        self._loggingingestion_client = LoggingClient(self._config,timeout=60.0)
 
     def send_appoint_result(self, result: ReserveResultPojo):
         if result.type == PublishType.SUCCESS:
diff --git a/main.py b/main.py
index f8f811c..5c0fbfe 100644
--- a/main.py
+++ b/main.py
@@ -123,4 +123,4 @@ def get_proxy(phone_number):
 
 if __name__ == '__main__':
     # 修改起始行，结束行
-    start_book(1, 1)
+    start_book(32, 32)
diff --git a/modems/card_pool.py b/modems/card_pool.py
index 32e69b3..2cecdd0 100644
--- a/modems/card_pool.py
+++ b/modems/card_pool.py
@@ -48,15 +48,3 @@ class CardPool:
         for serial in self._serial_list:
             self._send_command(serial, "AT+USIM\r")
 
-
-if __name__ == '__main__':
-    card_pool = CardPool(params.CARD_POOL_PORT)
-    # print(card_pool.find_current_slot())
-    card_pool.reset()
-    # card_pool.switch_to_next()
-    # reset modem pool
-    # for port in get_devices_ports():
-    #     ser = serial.Serial(port, BAUDRATE, timeout=1)
-    #     send_command("AT+RESET\r", ser)
-    #     ser.close()
-    # card_pool.switch_to_slot(12)
diff --git a/params.py b/params.py
index f67e7e7..ce8fab7 100644
--- a/params.py
+++ b/params.py
@@ -5,42 +5,42 @@ from logs.LogSender import LogSender
 
 MODEM_POOL_PORTS = [
     # modem 1
-    "/dev/tty.usbmodem1421101",
-    "/dev/tty.usbmodem1421103",
-    "/dev/tty.usbmodem1421105",
-    "/dev/tty.usbmodem1421107",
-    "/dev/tty.usbmodem1421201",
-    "/dev/tty.usbmodem1421203",
-    "/dev/tty.usbmodem1421205",
-    "/dev/tty.usbmodem1421207",
-    "/dev/tty.usbmodem1421301",
-    "/dev/tty.usbmodem1421303",
-    # "/dev/tty.usbmodem1421305",
-    "/dev/tty.usbmodem1421307",
-    "/dev/tty.usbmodem1421401",
-    "/dev/tty.usbmodem1421403",
-    "/dev/tty.usbmodem1421405",
-    "/dev/tty.usbmodem1421407",
+    "/dev/tty.usbmodem1422101",
+    "/dev/tty.usbmodem1422103",
+    "/dev/tty.usbmodem1422105",
+    "/dev/tty.usbmodem1422107",
+    "/dev/tty.usbmodem1422201",
+    "/dev/tty.usbmodem1422203",
+    "/dev/tty.usbmodem1422205",
+    "/dev/tty.usbmodem1422207",
+    "/dev/tty.usbmodem1422301",
+    "/dev/tty.usbmodem1422303",
+    # "/dev/tty.usbmodem1422305",
+    "/dev/tty.usbmodem1422307",
+    "/dev/tty.usbmodem1422401",
+    "/dev/tty.usbmodem1422403",
+    "/dev/tty.usbmodem1422405",
+    "/dev/tty.usbmodem1422407",
     # modem2
-    "/dev/tty.usbmodem14221101",
-    "/dev/tty.usbmodem14221103",
-    "/dev/tty.usbmodem14221105",
-    "/dev/tty.usbmodem14221107",
-    "/dev/tty.usbmodem14221201",
-    "/dev/tty.usbmodem14221203",
-    "/dev/tty.usbmodem14221205",
-    "/dev/tty.usbmodem14221207",
-    # "/dev/tty.usbmodem14221301",
-    ## "/dev/tty.usbmodem14221303",
-    # "/dev/tty.usbmodem14221305",
-    # "/dev/tty.usbmodem14221307",
-    # "/dev/tty.usbmodem14221401",
-    # "/dev/tty.usbmodem14221403",
-    # "/dev/tty.usbmodem14221405",
-    # "/dev/tty.usbmodem14221407",
+    "/dev/tty.usbmodem1423101",
+    "/dev/tty.usbmodem1423103",
+    "/dev/tty.usbmodem1423105",
+    "/dev/tty.usbmodem1423107",
+    "/dev/tty.usbmodem1423201",
+    "/dev/tty.usbmodem1423203",
+    "/dev/tty.usbmodem1423205",
+    "/dev/tty.usbmodem1423207",
+    # "/dev/tty.usbmodem1423301",
+    ## "/dev/tty.usbmodem1423303",
+    # "/dev/tty.usbmodem1423305",
+    # "/dev/tty.usbmodem1423307",
+    # "/dev/tty.usbmodem1423401",
+    # "/dev/tty.usbmodem1423403",
+    # "/dev/tty.usbmodem1423405",
+    # "/dev/tty.usbmodem1423407",
 
 ]
-CARD_POOL_PORT = ["/dev/tty.usbmodem14221501", "/dev/tty.usbmodem1421601"]
+CARD_POOL_PORT = ["/dev/tty.usbmodem1423501", "/dev/tty.usbmodem1422601"]
 firebase_store_manager = DataManager()
 oracle_log_sender = LogSender()
 
diff --git a/scheduler.py b/scheduler.py
index d00037f..606c77f 100644
--- a/scheduler.py
+++ b/scheduler.py
@@ -18,8 +18,8 @@ def start_waiting_sms_job(sched):
     #               minute='30',
     #               misfire_grace_time=10,
     #               second='0', timezone='Europe/Paris', max_instances=1)
-    sched.add_job(waiting_for_sms_job, 'cron', day_of_week='mon-sat', hour='21',
-                  minute='00',
+    sched.add_job(waiting_for_sms_job, 'cron', day_of_week='mon-sat', hour='20',
+                  minute='40',
                   misfire_grace_time=10,
                   second='0', timezone='Europe/Paris', max_instances=1)