DavidLiu hai 5 meses
pai
achega
ba0b1dd08e

+ 2 - 2
src/core/callcenter/cache.py

@@ -64,7 +64,7 @@ class Cache:
     def add_call_info(self, call: CallInfo):
         for k, v in call.device_info_map.items():
             self.add_device(k, call.call_id)
-        # print('liuwei::debugger::add_call_info call_id:%s, call=%s'% (call.call_id, call))
+        # print('add_call_info call_id:%s, call=%s'% (call.call_id, call))
         self.redis_handler.set(CALL_INFO + call.call_id, call.to_json_string(), self.cacheDay * 24 * 60 * 60)
 
 
@@ -78,7 +78,7 @@ class Cache:
         text = None
         if call_id:
             text = self.redis_handler.get(CALL_INFO + call_id)
-            # print('liuwei::debugger::get_call_info call_id:%s, text:%s'% (call_id, text))
+            # print('get_call_info call_id:%s, text:%s'% (call_id, text))
         if text:
             return CallInfo.from_json(text)
 

+ 2 - 2
src/core/callcenter/callback.py

@@ -28,12 +28,12 @@ class Callback(object):
             call_id = self.cache.get_call_id_by_device_id(device_id)
         call_info = self.cache.get_call_info(call_id)
         if not call_info:
-            # self.logger.info("liuwei::debugger::callback:return::event_name=%s, call_id=%s, device_id=%s", event_name, call_id, device_id)
+            # self.logger.info("callback:return::event_name=%s, call_id=%s, device_id=%s", event_name, call_id, device_id)
             return
 
         call_type = CallType.get_by_code(call_info.call_type) if call_info else None
         device_info = call_info.device_info_map.get(device_id) if call_info and call_info.device_info_map else None
-        # self.logger.info("liuwei::debugger::callback::event_name=%s, call_type=%s, call_id=%s, device_id=%s, call_info=%s", event_name, call_type, call_id, device_id, call_info)
+        # self.logger.info("callback::event_name=%s, call_type=%s, call_id=%s, device_id=%s, call_info=%s", event_name, call_type, call_id, device_id, call_info)
         if CallType.BOT_CALL == call_type:
             threading.Thread(target=self.agent_event_service.bot_event_channel, args=(event, call_info, device_info)).start()
             # self.agent_event_service.bot_event_channel(event, call_info, device_info)

+ 11 - 5
src/core/callcenter/esl/handler/channel_answer_handler.py

@@ -24,23 +24,25 @@ class ChannelAnswerHandler(EslEventHandler):
     def handle(self, address, event, coreUUID):
         call_id = EslEventUtil.getCallId(event)
         call_info = self.cache.get_call_info(call_id)
-        self.logger.info("liuwei::debugger::answer call_id:%s, call_info:%s", call_id, call_info)
+        self.logger.info("answer call_id:%s, call_info:%s", call_id, call_info)
         if not call_info:
             return
 
         device_id = EslEventUtil.getDeviceId(event)
         device_info = call_info.device_info_map.get(device_id)
         if CallType.AGENT_CALL.code == call_info.call_type and device_info.device_type == DeviceType.CUSTOMER.code:
+            self.logger.info("liuwei::debugger::answer, 11111")
             self.record(event, device_id)
 
         if CallType.BOT_CALL.code == call_info.call_type and device_info.device_type == DeviceType.ROBOT.code:
+            self.logger.info("liuwei::debugger::answer, 22222")
             self.record(event, device_id)
             call_info.answer_flag = AnswerFlag.ROBOT_ANSWER.code
             registry.CALL_BOT_ANSWER_REQUESTS.labels(f"{call_info.bucket_type}").inc()
 
         next_command = call_info.next_commands[0] if len(call_info.next_commands) > 0 else None
         device_type = DeviceType.get_by_code(device_info.device_type)
-        self.logger.info("liuwei::debugger::ChannelAnswerHandler call_id:%s, device_id:%s, device_type:%s, next_command:%s"%(call_id, device_id, device_type, next_command))
+        self.logger.info("ChannelAnswerHandler call_id:%s, device_id:%s, device_type:%s, next_command:%s"%(call_id, device_id, device_type, next_command))
         if not next_command:
             return
 
@@ -48,7 +50,7 @@ class ChannelAnswerHandler(EslEventHandler):
         device_info.ring_end_time = EslEventUtil.getEventDateTimestamp(event)
         call_info.answer_count = call_info.answer_count + 1
         call_info.next_commands.remove(next_command)
-        self.logger.info("liuwei::debugger::ChannelAnswerHandler call_info.answer_time::%s,time:%s", call_info.answer_time, EslEventUtil.getEventDateTimestamp(event))
+        self.logger.info("ChannelAnswerHandler call_info.answer_time::%s,time:%s", call_info.answer_time, EslEventUtil.getEventDateTimestamp(event))
 
         if NextType.NEXT_CALL_OTHER.code == next_command.next_type:
             self.call_other(call_info, device_info, event)
@@ -76,6 +78,7 @@ class ChannelAnswerHandler(EslEventHandler):
         device_id = device.device_id
 
         # 启用录音, 生产时候打开
+        self.logger.info("liuwei::debugger::answer, 33333")
         record_url = self.record(event, device_id)
         device.record = record_url
         device.record_start_time = device.answer_time
@@ -111,6 +114,7 @@ class ChannelAnswerHandler(EslEventHandler):
     def call_bridge(self, call: CallInfo, device: DeviceInfo, next_command: NextCommand, event):
         self.logger.info("开始桥接电话: callId:%s, caller:%s, called:%s, device1:%s, device2:%s"% (call.call_id,
                          call.caller, call.called, next_command.device_id, next_command.next_value))
+        self.logger.info("liuwei::debugger::answer, 33333")
         self.record(event, device_id=device.device_id)
         device1 = call.device_info_map.get(next_command.device_id)
         device2 = call.device_info_map.get(next_command.next_value)
@@ -131,6 +135,7 @@ class ChannelAnswerHandler(EslEventHandler):
         if CallType.BOT_CALL.code == call.call_type:
             registry.CALL_BOT_TRANSFER_REQUESTS.labels(f"{call.bucket_type}").inc()
 
+        self.logger.info("liuwei::debugger::answer, 44444")
         self.record(event, device_id)
         call.next_commands.append(NextCommand(device_id, NextType.NEXT_TRANSFER_SUCCESS.code, call.device_list[1]))
         self.logger.info("转接电话中 callId:%s, from:%s, to:%s "% (call.call_id, from_device_id, device_id))
@@ -147,13 +152,14 @@ class ChannelAnswerHandler(EslEventHandler):
     def record(self, event, device_id):
         call_id = EslEventUtil.getCallId(event)
         call = self.cache.get_call_info(call_id)
+        self.logger.info("answer.record::call_id=%s, device_id=%s, call=%s", call_id, device_id, call)
         if not call:
-            self.logger.info("answer callInfo is null,call_id:%s"%call_id)
+            self.logger.info("answer.record callInfo is null,call_id:%s"%call_id)
             return
 
         device =call.device_info_map.get(device_id)
         if not device:
-            self.logger.info("answer deviceInfo is null,call_id:%s, device_id:%s"%(call_id, device_id))
+            self.logger.info("answer.record deviceInfo is null,call_id:%s, device_id:%s"%(call_id, device_id))
             return
 
         return self.start_recording(device_id, get_record_file_name(call_id, CallStage.ALL), call)

+ 1 - 1
src/core/callcenter/esl/handler/channel_hangup_handler.py

@@ -102,7 +102,7 @@ class ChannelHangupHandler(EslEventHandler):
             # 一般情况下,挂断其他所有设备
             if device_info.cdr_type <= 4 and not call_info.end_time and not skip_hangup_all:
                 call_info.end_time = device_info.end_time
-                self.logger.info("liuwei::debugger::hang_all, call_info:%s, device_info:%s"%(call_info,device_info))
+                self.logger.info("hang_all, call_info:%s, device_info:%s"%(call_info,device_info))
                 self.call_service.hangup_all(call_info, CallCause.HANGUP_EVENT)
                 # self.inbound_client.hangup_call(call_id, device_id, CallCause.HANGUP_EVENT)