debug

src/core/voip/bot.py

@@ -312,6 +312,8 @@ class MyCall(pj.Call):
     def send_bot_speaker(self, player_file):
         if not player_file :
             return
+        if not self.isActive():
+            return
         player_id = murmur3_32(player_file)
         self.player_complete_dict[player_id] = False
         # print('self.player_complete_dict[player_id]D:', player_id, player_file, self.player_complete_dict[player_id])
@@ -356,10 +358,10 @@ class MyCall(pj.Call):
         self.logger.info('handling_release %s', action.action_code)
         action_code = action.action_code
         if action_code == 'hang':  # 挂断
-            self.agent.hangup(self.user_part)
+            self.agent.hangup(self, self.user_part)
             self.end_statistics()
         elif action_code == 'transfer':  # 转人工
-            self.agent.transfer(user_part=self.user_part, call_id=self.session_id, device_id=self.device_id)
+            self.agent.transfer(call=self, user_part=self.user_part, call_id=self.session_id, device_id=self.device_id)
             self.end_statistics()
             #更新通话记录
             self.agent.dataHandleServer.update_record(self.session_id, service_category=2)
@@ -394,7 +396,7 @@ class MyCall(pj.Call):
 
         self.asr.close()
         # 远程挂机之后要将分机号回收
-        self.agent.hangup(self.user_part)
+        self.agent.hangup(self, self.user_part)
         # self.agent.release(self.user_part)
         self.end_statistics()
 
@@ -609,18 +611,18 @@ class BotAgent:
         if not _lock and len(self.accounts) == len(self.user_part_range):
             self.restart()
 
-    def transfer(self, user_part, call_id, device_id, service_id='00000000000000000'):
+    def transfer(self, call, user_part, call_id, device_id, service_id='00000000000000000'):
         if self.acd_service:
             self.acd_service.transfer_to_agent(call_id, device_id, service_id, hold=True)
         # sip_headers = {'P-LIBRA-HangUpReason': 'transferToAgent', 'P-LIBRA-ServiceId': service_id}
         try_count = 100
         while try_count >0:
             if self.cache.get_after_play_hold_music(call_id):
-                self.hangup(user_part)
+                self.hangup(call, user_part)
                 break
             time.sleep(0.1)
 
-    def hangup(self, user_part, reason="NORMAL_CLEARING", **sip_headers):
+    def hangup(self, call, user_part, reason="NORMAL_CLEARING", **sip_headers):
         call_op_param = pj.CallOpParam(True)
         call_op_param.statusCode = pj.PJSIP_SC_OK
         call_op_param.reason = reason
@@ -634,13 +636,16 @@ class BotAgent:
             sip_header_vector.push_back(_sip_header)
         call_op_param.txOption.headers = sip_header_vector
         try:
+            call.hangup(call_op_param)
             acc = self.accounts.get(user_part)
             if acc:
-                for k, v in acc.calls.items():
-                    self.logger.info('hangup, call_idx=%s, call_active=%s'%(k, v.isActive()))
-                    if v.isActive():
-                        v.hangup(call_op_param)
-                acc.calls.clear()
+                acc.calls.remove(call)
+            del call
+            #     for k, v in acc.calls.items():
+            #         self.logger.info('hangup, call_idx=%s, call_active=%s'%(k, v.isActive()))
+            #         if v.isActive():
+            #             v.hangup(call_op_param)
+            #     acc.calls.clear()
         except:
             traceback.print_exc()
         finally: