Merge pull request mitogen-hq#440 from spearlineltd/13896_changes

Adding followup check in hangup handler
cyara · Mar 9, 2023 · e3a707c · e3a707c
2 parents aad238b + edb0bb8
commit e3a707c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/roles/callserver/files/general/extensions_new_devel.conf b/roles/callserver/files/general/extensions_new_devel.conf
@@ -1730,7 +1730,8 @@ same => n,Return()
 [testType63HH]
 exten => s,1,Set(HANGUPCAUSE_STRING=${HANGUPCAUSE_KEYS()})
 same => n,NoOP(Channels with hangup cause information: ${HANGUPCAUSE_STRING} :: HANGUPCAUSE=${HANGUPCAUSE} :: companyId=${companyId} :: connected=${connected} :: ${SIPCALLID}:: ${SHARED(userInput,${CHANNEL})})
-same => n,Set(TT63_CALL_ENDED(${jpId})=${SIPCALLID},${SHARED(userInput,${CHANNEL})})
+;same => n,Set(TT63_CALL_ENDED(${jpId})=${SIPCALLID},${SHARED(userInput,${CHANNEL})})
+same => n,ExecIf($[ $["${fc}" == "1"] & $["${connected}" != "1"] ]?Set(TT63_CALL_ENDED(${jpId})=${SIPCALLID},${SHARED(userInput,${CHANNEL})},3):Set(TT63_CALL_ENDED(${jpId})=${SIPCALLID},${SHARED(userInput,${CHANNEL})},NULL))
 ;If failed call and we didn't send CANCEL then Insert a new record in job_processing_failed_call for jpId,testCounter, otherwise Move call recording
 same => n,ExecIf($[$["${connected}" != "1"] & $["${HANGUPCAUSE_STRING}" != ""]]?Set(TT63_CALL_FAILED()=${jpId},${testCounter},${HANGUPCAUSE(${HANGUPCAUSE_STRING},tech)}):ExecIf($["${connected}" = "1"]?System(mv -f /home/new_recordings/${jpId}_${testCounter}_${testTypeId}.wav /home/new_ready_to_upload/):))
 same => n,ExecIf($["${spearNum}" == "1"]?AGI(portCheckin.agi):Noop())

diff --git a/roles/callserver/files/general/func_odbc_new_devel.conf b/roles/callserver/files/general/func_odbc_new_devel.conf
@@ -826,7 +826,7 @@ writesql=UPDATE job_processing_sip_trunk SET call_connect_time=now() WHERE id='$
 [CALL_ENDED]
 prefix=TT63
 dsn=asterisk-mysql-new
-writesql=UPDATE job_processing_sip_trunk SET call_end_time=now(),sip_callid='${SQL_ESC(${VAL1})}',received_dtmf='${SQL_ESC(${VAL2})}' WHERE id='${SQL_ESC(${ARG1})}'
+writesql=UPDATE job_processing_sip_trunk SET call_end_time=now(),sip_callid='${SQL_ESC(${VAL1})}',received_dtmf='${SQL_ESC(${VAL2})}',call_description_id=IF('${SQL_ESC(${VAL3})}'=3,3,NULL) WHERE id='${SQL_ESC(${ARG1})}'
 
 [CALL_FAILED]
 prefix=TT63