事件剥离逻辑,fix

src/core/callcenter/agent.py

@@ -85,12 +85,13 @@ class AgentEventService:
 
         agent = self.data_handle_server.get_agent(saas_id, agent_num)
         if not agent:
-            self.logger.warn("event service channel agent is null %s %s %s %s %s", saas_id, event_name, caller, called, event.serialize('json'))
+            self.logger.warn("event service channel agent is null %s %s %s %s %s", saas_id, event_name, caller, called, json.loads(event.serialize('json')))
             return
         agent_monitor = self.data_handle_server.get_agent_monitor(saas_id, agent_num)
         if not agent_monitor:
-            self.logger.warn("event service channel agentMonitor is null %s %s %s %s %s", saas_id, event_name, caller, called, event.serialize('json'))
+            self.logger.warn("event service channel agentMonitor is null %s %s %s %s %s", saas_id, event_name, caller, called, json.loads(event.serialize('json')))
             return
+
         # 信道发起事件，触发完成发起（或桥）&& 坐席侧
         if CHANNEL_ORIGINATE == event_name and is_agent:
             self.push_handler.push_on_agent_work_report(saas_id, flow_id, agent_num, call_id, AgentScene.MANUAL, WorkStatus.AGENT_RINGING)

src/core/callcenter/callback.py

@@ -6,7 +6,7 @@ import src.core.callcenter.esl.utils.esl_event_util as EslEventUtil
 from src.core.callcenter.agent import AgentEventService
 from src.core.callcenter.cache import Cache
 from src.core.callcenter.enumeration import CallType
-from src.core.callcenter.esl.constant.event_names import CUSTOM
+from src.core.callcenter.esl.constant.event_names import CUSTOM, DETECTED_TONE
 
 
 class Callback(object):
@@ -19,8 +19,8 @@ class Callback(object):
 
     def callback_event(self, event):
         event_name = EslEventUtil.getEventName(event)
-
-        if not (CUSTOM == event_name or event_name.startswith('CHANNEL_') or event_name.startswith('PLAYBACK_') or event_name.startswith('PLAYBACK_')):
+        # CUSTOM == event_name or
+        if not (event_name.startswith('CHANNEL_') or event_name.startswith('PLAYBACK_') or event_name == DETECTED_TONE):
             return
         call_id = EslEventUtil.getCallId(event)
         device_id = EslEventUtil.getDeviceId(event)