Merge branch 'develop' of ssh://gitlab.fuxicarbon.com:1111/client_service/voice-gateway-service into develop

src/core/callcenter/ws.py

@@ -79,7 +79,7 @@ class MyNamespace(Namespace):
         now = datetime.now().timestamp()
         key = CENTER_AGENT_HEARTBEAT % saas_id
         redis_handler.redis.hset(key, agent_id, now)
-        logger.info("on_heartbeat %s %s", agent_id, now)
+        # logger.info("on_heartbeat %s %s", agent_id, now)
 
     def on_OnPrompt(self, event):
         pass

src/core/voip/bot.py

@@ -168,7 +168,7 @@ class Account(pj.Account):
         print("***OnRegState: " + prm.reason, ai.id,ai.isDefault,ai.uri,ai.regIsConfigured,ai.regIsActive,ai.regExpiresSec,ai.regStatus,ai.regStatusText,ai.regLastErr,ai.onlineStatus,ai.onlineStatusText)
 
     def onIncomingCall(self, prm):
-        self.agent.logger.info("daviddebugger::onIncomingCall::%s ", prm.callId)
+        # self.agent.logger.info("daviddebugger::onIncomingCall::%s ", prm.callId)
         ai = self.getInfo()
         print("***onIncomingCall: ", prm.callId, ai.id,ai.isDefault,ai.uri,ai.regIsConfigured,ai.regIsActive,ai.regExpiresSec,ai.regStatus,ai.regStatusText,ai.regLastErr,ai.onlineStatus,ai.onlineStatusText)
 
@@ -523,7 +523,7 @@ class BotAgent:
             self.cache.set_register_per_hours(expire=timeout_sec - (60*3))
             # Create and initialize the library
             ep_cfg = pj.EpConfig()
-            ep_cfg.uaConfig.threadCnt = 1
+            ep_cfg.uaConfig.threadCnt = 8
             ep_cfg.uaConfig.mainThreadOnly = False
             ep_cfg.uaConfig.maxCalls = 32
             ep_cfg.uaConfig.maxAccounts = 32
@@ -583,8 +583,13 @@ class BotAgent:
             registry.BOT_AGENT_LIVES.set(self.user_part_pool.qsize())
             self.ep.libHandleEvents(100)
 
+        self.logger.info("create pjsua will shutdown")
+        self.call_players.clear()
+        self.accounts.clear()
+        self.calls.clear()
         # Destroy the library
         self.ep.libDestroy()
+        self.logger.info("create pjsua already shutdown")
 
     def main_thread_daemon(self):
         while not self.daemon_stopping:
@@ -615,7 +620,8 @@ class BotAgent:
                 continue
             if len(v) == 1:
                 sec = datetime.now().timestamp() - v[0]
-                if sec > 90:
+                self.logger.info("daviddebugger::play_complete_degree_check, sec=%s", sec)
+                if sec > 10:
                     return True
         return False
 
@@ -721,14 +727,16 @@ class BotAgent:
         except:
             pass
         self.logger.info("destroy, come in 22222")
-        self.call_players.clear()
-        self.accounts.clear()
-        self.calls.clear()
+        # self.call_players.clear()
+        # self.accounts.clear()
+        # self.calls.clear()
         # # Destroy the library
         # self.ep.libDestroy()
+        time.sleep(0.2)
         self.logger.info("destroy, come in 33333")
 
         if not self.pjsua_thread.is_alive():
+            self.logger.info("destroy, pre thread already stopped")
             return
         ident = self.pjsua_thread.ident
         thread_id = ctypes.pythonapi.PyThreadState_SetAsyncExc