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

Changed to use server-specific cid_channels_recent table

Browse Source 
git-svn-id: svn://192.168.202.10@2977 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2018-05-11 20:55:35 +00:00
parent b22e0bb335
commit b76bf2b3fc
3 changed files with 109 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agi/agi-VDAD_local_optimize.agi
+17 -2
View File
@@ -7,11 +7,12 @@
# two digits stripped off. IE 138368 -> 8368. This is to overcome the change
# to Local channels in Asterisk 12 and later.
#
# Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# Copyright (C) 2018 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
#
# CHANGELOG
# 170104-1700 - First build
# 170420-1100 - Indexed call_date and added it to the channel lookup
# 180511-1220 - Changed to use server-specific cid_channels_recent table
#
use strict;
@@ -73,6 +74,9 @@ my $AGI = new Asterisk::AGI;
my $dbhA = DBI->connect("DBI:mysql:" . $conf{VARDB_database} . ":" . $conf{VARDB_server} . ":" . $conf{VARDB_port},
$conf{VARDB_user}, $conf{VARDB_pass}) or die "Couldn't connect to database: " . DBI->errstr;
my $PADserver_ip = $conf{VARserver_ip};
$PADserver_ip =~ s/(\d+)(\.|$)/sprintf "%3.3d$2",$1/eg;
$PADserver_ip =~ s/\.//eg;
my %agi_vars = $AGI->ReadParse();
@@ -86,8 +90,19 @@ my $dest_channel = "";
my $new_extension = substr( $extension, 2 );
my $cid_channels_recent = 'cid_channels_recent';
my $CCRrec=0;
my $stmtA = "SHOW TABLES LIKE \"cid_channels_recent_$PADserver_ip\";";
my $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
$CCRrec=$sthA->rows;
$sthA->finish();
if ($CCRrec > 0)
{$cid_channels_recent = "cid_channels_recent_$PADserver_ip";}
print STDERR "$CCRrec|$cid_channels_recent|$stmtA\n";
# find the local channel's real channel
my $stmtA = "SELECT dest_channel FROM cid_channels_recent where (caller_id_name = '$cid_name' or connected_line_name = '$connected_line_name' or caller_id_name = '$connected_line_name' or connected_line_name = '$cid_name') and ( linkedid = '$uniqueid' or dest_uniqueid = '$uniqueid' or uniqueid = '$uniqueid') and call_date > '$SQL2mindate'";
my $stmtA = "SELECT dest_channel FROM $cid_channels_recent where (caller_id_name = '$cid_name' or connected_line_name = '$connected_line_name' or caller_id_name = '$connected_line_name' or connected_line_name = '$cid_name') and ( linkedid = '$uniqueid' or dest_uniqueid = '$uniqueid' or uniqueid = '$uniqueid') and call_date > '$SQL2mindate'";
my $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
print STDERR "$stmtA\n";
bin/AST_flush_DBqueue.pl
+39
View File
@@ -23,6 +23,7 @@
# 160101-1124 - Added flush of routing_initiated_recordings table
# 161214-1039 - Added flush of parked_channels_recent table
# 180112-0915 - Added flush for cid_channels_recent table
# 180511-1223 - Added flush for server-specific cid_channels_recent_ tables
#
### begin parsing run-time options ###
@@ -358,6 +359,44 @@ if (!$T)
if (!$Q) {print " - OPTIMIZE vicidial_lists \n";}
### Gather active servers from the database
$stmtA = "SELECT server_ip,server_id FROM servers where active='Y' and active_asterisk_server='Y';";
$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
$sthArows=$sthA->rows;
$aas=0;
while ($sthArows > $aas)
{
@aryA = $sthA->fetchrow_array;
$dialer_ip[$aas] = $aryA[0];
$dialer_id[$aas] = $aryA[1];
$PADserver_ip[$aas] = $aryA[0];
$PADserver_ip[$aas] =~ s/(\d+)(\.|$)/sprintf "%3.3d$2",$1/eg;
$PADserver_ip[$aas] =~ s/\.//eg;
$aas++;
}
$sthA->finish();
$aas=0;
while ($sthArows > $aas)
{
$CCRrec=0;
$stmtA = "SHOW TABLES LIKE \"cid_channels_recent_$PADserver_ip[$aas]\";";
$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
$CCRrec=$sthA->rows;
if($DB){print STDERR "\n|$CCRrec|$stmtA|\n";}
if ($CCRrec > 0)
{
$stmtA = "DELETE from cid_channels_recent_$PADserver_ip[$aas] where call_date < '$SQLdate_NEG_2min';";
if($DB){print STDERR "\n|$stmtA|\n";}
if (!$T) { $affected_rows = $dbhA->do($stmtA);}
if (!$Q) {print " - cid_channels_recent_$PADserver_ip[$aas] flush: $affected_rows rows\n";}
}
$aas++;
}
$sthA->finish();
$dbhA->disconnect();
bin/AST_update_AMI2.pl
+53 -4
View File
@@ -5,12 +5,13 @@
# This script uses the Asterisk Manager interface to update the live_channels
# tables and verify the parked_channels table in the asterisk MySQL database
#
# Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# Copyright (C) 2018 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
#
# CHANGES
# 170915-2110 - Initial version for Asterisk 13, based upon AST_update.pl
# 171002-1111 - Fixed timeout erase channels issue, added more debug output
# 171228-1832 - Added more debug logging
# 180511-1146 - Changed to use server-specific cid_channels_recent table
#
# constants
@@ -93,6 +94,8 @@ foreach(@conf)
if ($line =~ /^VARDB_database/) {$VARDB_database = $line; $VARDB_database =~ s/.*=//gi;}
if ($line =~ /^VARDB_user/) {$VARDB_user = $line; $VARDB_user =~ s/.*=//gi;}
if ($line =~ /^VARDB_pass/) {$VARDB_pass = $line; $VARDB_pass =~ s/.*=//gi;}
if ($line =~ /^VARDB_custom_user/) {$VARDB_custom_user = $line; $VARDB_custom_user =~ s/.*=//gi;}
if ($line =~ /^VARDB_custom_pass/) {$VARDB_custom_pass = $line; $VARDB_custom_pass =~ s/.*=//gi;}
if ($line =~ /^VARDB_port/) {$VARDB_port = $line; $VARDB_port =~ s/.*=//gi;}
$i++;
}
@@ -140,6 +143,7 @@ if (try_load($module))
$bs_loaded=1;
}
$dbhA = DBI->connect("DBI:mysql:$VARDB_database:$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass")
or die "Couldn't connect to database: " . DBI->errstr;
@@ -203,6 +207,50 @@ if ($SUrec < 1)
$event_string='LOGGED INTO MYSQL SERVER ON 1 CONNECTION|';
event_logger($SYSLOG,$event_string);
##### BEGIN Check for a cid_channels_recent_IPXXXXX... table, and if not present, create one
$cid_channels_recent = 'cid_channels_recent';
$PADserver_ip = $server_ip;
$PADserver_ip =~ s/(\d+)(\.|$)/sprintf "%3.3d$2",$1/eg;
$PADserver_ip =~ s/\.//eg;
$CCRrec=0; $affected_rowsCCR=0;
$stmtA = "SHOW TABLES LIKE \"cid_channels_recent_$PADserver_ip\";";
$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
$CCRrec=$sthA->rows;
if($DB){print STDERR "\n|$CCRrec|$stmtA|\n";}
if ($CCRrec > 0)
{$cid_channels_recent = "cid_channels_recent_$PADserver_ip";}
else
{
$dbhB = DBI->connect("DBI:mysql:$VARDB_database:$VARDB_server:$VARDB_port", "$VARDB_custom_user", "$VARDB_custom_pass")
or warn "Couldn't connect to database: " . DBI->errstr;
$stmtB = "CREATE TABLE cid_channels_recent_$PADserver_ip (caller_id_name VARCHAR(30) NOT NULL, connected_line_name VARCHAR(30) NOT NULL, call_date DATETIME, channel VARCHAR(100) DEFAULT '', dest_channel VARCHAR(100) DEFAULT '', linkedid VARCHAR(20) DEFAULT '', dest_uniqueid VARCHAR(20) DEFAULT '', uniqueid VARCHAR(20) DEFAULT '', index(call_date)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";
if($DB){print STDERR "\n$stmtB\n";}
eval { $affected_rowsCCR = $dbhB->do($stmtB) };
print "Query failed: $@\n" if $@;
eval { $dbhB->disconnect() };
print "Disconnect failed: $@\n" if $@;
$stmtA = "SHOW TABLES LIKE \"cid_channels_recent_$PADserver_ip\";";
$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
$CCRrec=$sthA->rows;
if($DB){print STDERR "\n|$CCRrec|$stmtA|\n";}
if ($CCRrec > 0)
{$cid_channels_recent = "cid_channels_recent_$PADserver_ip";}
}
print STDERR "$CCRrec|$cid_channels_recent|$stmtA\n";
$event_string='TABLE CHECK cid_channels_recent_$PADserver_ip complete|$CCRrec|$affected_rowsCCR|';
event_logger($SYSLOG,$event_string);
##### END Check for a cid_channels_recent_IPXXXXX... table, and if not present, create one
### concurrency check (SCREEN uses script path, so check for more than 2 entries)
if ($run_check > 0)
{
@@ -937,7 +985,7 @@ sub process_channels
}
elsif ($DB) { print STDERR "|no trunk channels to delete|\n"; }
# build the cid_channels_recent insert
# build the cid_channels_recent_$PADserver_ip insert
$cid_chan_sql = '';
$cid_chan_count = 0;
foreach $call_id (keys %cid_chan_hash)
@@ -948,7 +996,7 @@ sub process_channels
$cid_chan_sql .= "( ";
$cid_chan_sql .= "'" . $cid_chan_hash{"$call_id"}->{'calleridname'} . "', ";
$cid_chan_sql .= "'" . $cid_chan_hash{"$call_id"}->{'connectedlinename'} . "', ";
$cid_chan_sql .= "'$server_ip', ";
# $cid_chan_sql .= "'$server_ip', ";
$cid_chan_sql .= "NOW(), ";
$cid_chan_sql .= "'" . $cid_chan_hash{"$call_id"}->{'channel'} . "', ";
$cid_chan_sql .= "'" . $cid_chan_hash{"$call_id"}->{'dest_channel'} . "', ";
@@ -962,7 +1010,8 @@ sub process_channels
if ( $cid_chan_count > 0 )
{
$stmtA = "INSERT IGNORE INTO cid_channels_recent (caller_id_name, connected_line_name, server_ip, call_date, channel, dest_channel, linkedid, dest_uniqueid, uniqueid) values \n\t";
# $stmtA = "INSERT IGNORE INTO cid_channels_recent (caller_id_name, connected_line_name, server_ip, call_date, channel, dest_channel, linkedid, dest_uniqueid, uniqueid) values \n\t";
$stmtA = "INSERT IGNORE INTO $cid_channels_recent (caller_id_name, connected_line_name, call_date, channel, dest_channel, linkedid, dest_uniqueid, uniqueid) values \n\t";
$stmtA .= $cid_chan_sql;
if ($DB) { print STDERR "$stmtA\n"; }
$stmtA =~ s/\n|\t//gi;