Svetlana 3 yıl önce
ebeveyn
işleme
d48738bd13
1 değiştirilmiş dosya ile 8 ekleme ve 3 silme
  1. 8 3
      app/app.py

+ 8 - 3
app/app.py

@@ -243,12 +243,16 @@ async def celCallback(mngr: Manager, msg: Message):
     app.cache['cel_calls'][lid]['all_channels'] = {}
     app.cache['cel_calls'][lid]['transfers'] = []
     #app.cache['cel_calls'][lid]['mix_monitors'] = []
-    if (False or msg.Context=='from-internal'):
+    if (msg.Context=='from-internal'):
       sip_call_id = await amiChannelGetVar(msg.Channel,"PJSIP_HEADER(read,UniqueId)")
-      if( False and   not sip_call_id):
-        sip_call_id = await amiChannelGetVar(msg.Channel,"PJSIP_HEADER(read,Call-ID)")
+      #if( False and   not sip_call_id):
+      #  sip_call_id = await amiChannelGetVar(msg.Channel,"PJSIP_HEADER(read,Call-ID)")
       if (sip_call_id):
         await amiChannelSetVar(msg.Channel,"CDR(userfield)",sip_call_id)
+      webcallid = await amiChannelGetVar(msg.Channel,"PJSIP_HEADER(read,WebCallId)")
+      if (webcallid):
+        app.logger.warning('set webcallid {} for {} from header'.format(webcallid,lid))
+        app.cache['cel_calls'][lid]['WebCallId'] = webcallid
     
   if (lid in app.cache['cel_calls']):
     firstMessage = app.cache['cel_calls'][lid]
@@ -369,6 +373,7 @@ async def celCallback(mngr: Manager, msg: Message):
     if (msg.EventName == 'USER_DEFINED') and (msg.UserDefType == 'SETVARIABLE'):
       varname, value = msg.AppData.split(',')[1].split('=')[0:2]
       app.cache['cel_calls'][lid][varname]=value
+      app.logger.warning('set {} = {} for  {}'.format(varname,value,lid))
       if (lid in app.cache['calls']):
         app.cache['calls'][lid][varname]=value