774056846 4 月之前
父节点
当前提交
9331e11d7b

+ 3 - 3
src/core/callcenter/acd.py

@@ -31,17 +31,17 @@ class AcdService:
 
     def transfer_to_agent(self, call_id, device_id, service_id):
         call_info = self.cache.get_call_info(call_id)
-        self.logger.info('debugger::transfer_to_agent, come in, call_id:%s, call_info:%s'%(call_id, call_info))
+        self.logger.info('transfer_to_agent, come in, call_id:%s, call_info:%s'%(call_id, call_info))
         if not call_info:
             return
         call_info.answer_flag = AnswerFlag.TRANSFER_TO_AGENT.code
         self.cache.add_call_info(call_info)
         # 1. hold住并且播放等待音
         self.call_service.hold(call_info, device_id)
-        self.logger.info('debugger::transfer_to_agent, 1111111 ')
+        self.logger.info('transfer_to_agent, 1111111 ')
         # 获得空闲坐席
         agent_number = self.agent_service.assign(AgentActionRequest(saas_id=saasId, service_id=service_id))
-        self.logger.info('debugger::transfer_to_agent, 222222 %s'%agent_number)
+        self.logger.info('transfer_to_agent, 222222 %s'%agent_number)
         if not agent_number:
             # 如果没有空闲坐席,播放等待音
             self.logger.info("AcdService transferToAgent agentNumber is empty serviceId:%s,called:%s,callId:%s"%(

+ 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('daviddebugger::add_call_info call_id:%s, call=%s'% (call.call_id, call))
+        # print('davidadd_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)
 
 
@@ -79,7 +79,7 @@ class Cache:
         text = None
         if call_id:
             text = self.redis_handler.get(CALL_INFO + call_id)
-            # print('daviddebugger::get_call_info call_id:%s, text:%s'% (call_id, text))
+            # print('davidget_call_info call_id:%s, text:%s'% (call_id, text))
         if text:
             return CallInfo.from_json(text)
 

+ 3 - 3
src/core/callcenter/call.py

@@ -73,12 +73,12 @@ class CallService:
         except:
             pass
         custom_device_id = devices[0]
-        self.logger.info('debugger::hold, custom_device_id=%s'%custom_device_id)
+        self.logger.info('hold, custom_device_id=%s'%custom_device_id)
         # self.client.sync_invoke_method("bridge_break", method_args=(custom_device_id,))
         # self.client.sync_invoke_method("hold_play", method_args=(custom_device_id,HOLD_MUSIC_PATH))
         self.client.bridge_break(call_info.call_id, custom_device_id)
         self.cache.set_need_play_hold_music(call_info.call_id)
-        self.logger.info('debugger::hold success custom_device_id=%s'%custom_device_id)
+        self.logger.info('hold success custom_device_id=%s'%custom_device_id)
 
     def cancel_hold(self, call_info: CallInfo, device_id):
         self.client.bridge_call(call_info.call_id, call_info.device_list[0], call_info.device_list[1])
@@ -101,7 +101,7 @@ class CallService:
         call_info.device_info_map[device_id] = device_info
         call_info.next_commands.append(NextCommand(device_info.device_id, NextType.NEXT_TRANSFER_CALL.code, call_info.device_list[0]))
         call_info.agent_key = agent_number
-        self.logger.info('lwdebugger::transfer, agent_number=%s, device_id=%s, call_info=%s'% (agent_number, device_id, call_info))
+        self.logger.info('transfer, agent_number=%s, device_id=%s, call_info=%s'% (agent_number, device_id, call_info))
         # agent.sip_server
         self.cache.add_call_info(call_info)
         self.cache.add_agent_info(agent=agent, call_id=call_id, device_id=device_id)

+ 4 - 4
src/core/callcenter/esl/client.py

@@ -424,7 +424,7 @@ class InboundClient:
             _con = ESL.ESLconnection(self.host, self.port, self.password)
             if _con.connected():
                 e = _con.api(command, arg)
-                self.logger.info('debugger::%s success, arg=%s, event=%s' % (desc, command + ' ' + arg, e.serialize('json')))
+                self.logger.info('%s success, arg=%s, event=%s' % (desc, command + ' ' + arg, e.serialize('json')))
         except:
             traceback.print_exc()
         finally:
@@ -437,7 +437,7 @@ class InboundClient:
             _con = ESL.ESLconnection(self.host, self.port, self.password)
             if _con.connected():
                 e = _con.bgapi(command, arg)
-                self.logger.info('debugger::%s success, arg=%s, event=%s' % (desc, command + ' '+arg, e.serialize('json')))
+                self.logger.info('%s success, arg=%s, event=%s' % (desc, command + ' '+arg, e.serialize('json')))
         except:
             traceback.print_exc()
         finally:
@@ -552,7 +552,7 @@ class OutboundClient:
                     else:
                         #转到ai机器人
                         destination = self.server.agent.register(**kwargs)
-                        self.server.logger.info("debugger::device_id=%s, destination=%s, new_device_id=%s"% (device_id, destination, new_device_id))
+                        self.server.logger.info("device_id=%s, destination=%s, new_device_id=%s"% (device_id, destination, new_device_id))
                         call_info['type'] = 1
                         call_info['service_category'] = 1
                         call_info['user_id'] = destination
@@ -609,7 +609,7 @@ class OutboundClient:
             self.server.logger.info("liuwei::debugger:4444::call_id=%s, device_id=%s" % (call_id, new_device_id))
             # call_info.next_commands.append(NextCommand(device_id, NextType.NEXT_CALL_BRIDGE.code, new_device_id))
             call_info.device_info_map = {device_id: device_custom, new_device_id: device_bot}
-            self.server.logger.info("lwdebugger::outBound, call_info=%s"%(call_info))
+            self.server.logger.info("lwoutBound, call_info=%s"%(call_info))
             self.server.cache.add_call_info(call_info)
 
 

+ 3 - 3
src/core/callcenter/esl/handler/channel_answer_handler.py

@@ -27,7 +27,7 @@ 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("lwdebugger::answer call_id:%s, call_info:%s, event:%s"% (call_id, call_info, json.loads(event.serialize('json'))))
+        # self.logger.info("lwanswer call_id:%s, call_info:%s, event:%s"% (call_id, call_info, json.loads(event.serialize('json'))))
         if not call_info:
             return
 
@@ -35,7 +35,7 @@ class ChannelAnswerHandler(EslEventHandler):
         device_info = call_info.device_info_map.get(device_id)
         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("lwdebugger::ChannelAnswerHandler call_id:%s, device_id:%s, device_type:%s, next_command:%s"%(call_id, device_id, device_type, next_command))
+        self.logger.info("lwChannelAnswerHandler 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
 
@@ -88,7 +88,7 @@ class ChannelAnswerHandler(EslEventHandler):
                                 call_time=now, device_type=DeviceType.CUSTOMER.code, caller_display=route_gateway.name, cdr_type=CdrType.OUTBOUND.code)
         call.next_commands.append(NextCommand(device_id=device_id, next_type=NextType.NEXT_CALL_BRIDGE.code, next_value=new_device_id))
         call.device_info_map[new_device_id] = new_device
-        # self.logger.info("lwdebugger::call_other, call_info=%s"%call)
+        # self.logger.info("lwcall_other, call_info=%s"%call)
         self.cache.add_call_info(call)
         self.cache.add_agent_info(agent=agent, call_id=call_id, device_id=device_id)
 

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

@@ -19,7 +19,7 @@ class ChannelBridgeHandler(EslEventHandler):
         device_id = EslEventUtil.getDeviceId(event)
         call = self.cache.get_call_info(call_id)
         device = call.device_info_map.get(device_id)
-        self.logger.info('debugger::device_id: %s, device:%s ', device_id, device)
+        self.logger.info('device_id: %s, device:%s ', device_id, device)
         if device.device_type == DeviceType.AGENT.code: # 如果是坐席接听 变更坐席状态
             self.dataHandleServer.update_agent_monitor_service_state(device_id, AgentServiceState.IDLE.code)
         pass

+ 7 - 6
src/core/callcenter/esl/handler/channel_hangup_handler.py

@@ -31,26 +31,26 @@ class ChannelHangupHandler(EslEventHandler):
         self.logger.info(json.loads(event.serialize('json')))
         try:
             call_id = EslEventUtil.getCallId(event)
-            self.logger.info('debugger::call_id is %s', call_id)
+            self.logger.info('call_id is %s', call_id)
             if not call_id:
                 self.release(event)
                 self.logger.info("call_id is null")
                 return
             call = self.cache.get_call_info(call_id)
-            self.logger.info('debugger::call_info is %s', call)
+            self.logger.info('call_info is %s', call)
             if not call:
                 self.logger.info("call:%s is null", call_id)
                 return
             device_id = EslEventUtil.getDeviceId(event)
             device_id = device_id if device_id else EslEventUtil.getUniqueId(event)
             device = call.device_info_map.get(device_id)
-            # self.logger.info('debugger::device_id is ', device_id)
+            # self.logger.info('device_id is ', device_id)
             if not device:
                 self.logger.info("device:%s is null", device_id)
                 return
 
             count = len(call.device_list)
-            self.logger.info('lwdebugger::ChannelHangupHandler, call_id=%s, device_id=%s, count=%s'% (call_id, device_id, count))
+            self.logger.info('ChannelHangupHandler, call_id=%s, device_id=%s, count=%s'% (call_id, device_id, count))
             try:
                 call.device_list.remove(device_id)
             except:
@@ -87,14 +87,14 @@ class ChannelHangupHandler(EslEventHandler):
             # 更新通话记录
             # self.dataHandleServer.update_record(call_id, {"time_end": datetime.fromtimestamp(int(device.end_time)),"times":device.talk_time})
 
-            self.logger.info('debugger::ChannelHangupHandler, hangup_reason=%s, device_type=%s, cdr_type=%s, end_time=%s, skip_hangup_all=%s' % (hangup_reason, device.device_type, device.cdr_type, call.end_time, skip_hangup_all))
+            self.logger.info('ChannelHangupHandler, hangup_reason=%s, device_type=%s, cdr_type=%s, end_time=%s, skip_hangup_all=%s' % (hangup_reason, device.device_type, device.cdr_type, call.end_time, skip_hangup_all))
             # 如果是转人工
             # if 'transferToAgent' == hangup_reason and DeviceType.ROBOT.code == device.device_type:
             #     call.answer_flag = AnswerFlag.TRANSFER_TO_AGENT.code
             #     service_id = EslEventUtil.getLIBRAServiceId(event)
             #     call.transfer_agent = True
             #     self.cache.add_call_info(call)
-            #     self.logger.info('debugger::ChannelHangupHandler, transferToAgent, service_id=%s' % (service_id))
+            #     self.logger.info('ChannelHangupHandler, transferToAgent, service_id=%s' % (service_id))
             #     self.acd_service.transfer_to_agent(call, device_id, service_id)
             #     return
 
@@ -106,6 +106,7 @@ class ChannelHangupHandler(EslEventHandler):
             # 一般情况下,挂断其他所有设备
             if device.cdr_type <= 4 and not call.end_time and not skip_hangup_all:
                 call.end_time = device.end_time
+                self.logger.info("liuwei::debugger::hang_all, call_info:%s, device_info:%s"%(call,device))
                 self.call_service.hangup_all(call, CallCause.HANGUP_EVENT)
                 # self.inbound_client.hangup_call(call_id, device_id, CallCause.HANGUP_EVENT)