ViciDial/agc_2-X
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added List CID Group Override to the List Modification admin screen.

Browse Source 
Added new vicidial_dial_cid_log database call logging

git-svn-id: svn://192.168.202.10@3589 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2022-03-12 20:46:51 +00:00
parent b04838c26b
commit 08890aa5df
14 changed files with 673 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/ADMIN_keepalive_ALL.pl
+27 -5
View File
@@ -15,7 +15,7 @@
# - Auto reset lists at defined times
# - Auto restarts Asterisk process if enabled in servers settings
#
# Copyright (C) 2021 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# Copyright (C) 2022 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
#
# CHANGES
# 61011-1348 - First build
@@ -154,9 +154,10 @@
# 210827-0939 - Added PJSIP compatibility
# 210924-2333 - Fix for calls_today issue at timeclock-end-of-day
# 220310-0959 - Added purging of vicidial_sync_log table
# 220312-0819 - Added CID Group Auto-Rotate to check for List use
#
$build = '220310-0959';
$build = '220312-0819';
$DB=0; # Debug flag
$teodDB=0; # flag to log Timeclock End of Day processes to log file
@@ -5009,6 +5010,13 @@ if ( ($active_voicemail_server =~ /$server_ip/) && ((length($active_voicemail_se
$i=0;
while ($sthArows > $i)
{
$Rcampaign_calldate='';
$Rcampaign_id='';
$Rcampaign_calldate_epoch=0;
$Lcampaign_calldate='';
$Llist_id='';
$Lcampaign_calldate_epoch=0;
$stmtA = "SELECT campaign_calldate,campaign_id,UNIX_TIMESTAMP(campaign_calldate) from vicidial_campaigns where cid_group_id='$cid_group_id[$i]' order by campaign_calldate desc limit 1;";
if ($DBX) {print "$stmtA\n";}
$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
@@ -5023,13 +5031,27 @@ if ( ($active_voicemail_server =~ /$server_ip/) && ((length($active_voicemail_se
}
$sthA->finish();
if ( ($Rcampaign_calldate_epoch < $FMtarget) && (length($cid_auto_rotate_cid[$i]) >= 6 ) )
$stmtA = "SELECT list_lastcalldate,list_id,UNIX_TIMESTAMP(list_lastcalldate) from vicidial_lists where cid_group_id='$cid_group_id[$i]' order by list_lastcalldate desc limit 1;";
if ($DBX) {print "$stmtA\n";}
$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
$sthArowsX=$sthA->rows;
if ($sthArowsX > 0)
{
if ($DB) {print " skip CID Group rotate, no recent campaign calls: $cid_group_id[$i]|$Rcampaign_id|$Rcampaign_calldate| ($Rcampaign_calldate_epoch <> $FMtarget)\n";}
@aryA = $sthA->fetchrow_array;
$Lcampaign_calldate = $aryA[0];
$Llist_id = $aryA[1];
$Lcampaign_calldate_epoch = $aryA[2];
}
$sthA->finish();
if ( ( ($Rcampaign_calldate_epoch < $FMtarget) && ($Lcampaign_calldate_epoch < $FMtarget) ) && (length($cid_auto_rotate_cid[$i]) >= 6 ) )
{
if ($DB) {print " skip CID Group rotate, no recent campaign/list calls: $cid_group_id[$i]|$Rcampaign_id|$Rcampaign_calldate| ($Rcampaign_calldate_epoch <> $FMtarget)|$Llist_id|$Lcampaign_calldate|($Lcampaign_calldate_epoch < $FMtarget)\n";}
}
else
{
if ($DBX) {print " DEBUG: CID Group rotate, recent campaign calls: $cid_group_id[$i]|$Rcampaign_id|$Rcampaign_calldate| ($Rcampaign_calldate_epoch <> $FMtarget)\n";}
if ($DBX) {print " DEBUG: CID Group rotate, recent campaign/list calls: $cid_group_id[$i]|$Rcampaign_id|$Rcampaign_calldate| ($Rcampaign_calldate_epoch <> $FMtarget)|$Llist_id|$Lcampaign_calldate|($Lcampaign_calldate_epoch < $FMtarget)\n";}
$rotate_run_minutes = (($secX - $cid_last_auto_rotate_epoch[$i]) / 60);
if ($rotate_run_minutes < $cid_auto_rotate_minutes[$i])
{