diff --git a/UPGRADE b/UPGRADE index c3773f94..a0fa1b68 100644 --- a/UPGRADE +++ b/UPGRADE @@ -5,17 +5,18 @@ NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom ########## UPGRADING FROM 2.0.1 TO 2.0.2 ########## 1. upgrade the MySQL Asterisk database: -mysql -use asterisk -\. /path/from/root/extras/upgrade_2.0.2.sql -quit + mysql + use asterisk + \. /path/from/root/extras/upgrade_2.0.2.sql + quit 2. The astguiclient web directory has been removed and the astguiclient/admin.php functions have been merged into the vicidial/admin.php page 3. You can now define trunks for use only by specific campaigns. See the help - in the server modification page under the VICIDIAL SERVER TRUNKS section. + in the vicidial/admin.php server modification page under the + VICIDIAL SERVER TRUNKS section. 4. Agents now have the ability to control volume levels for any call in their meetme room directly from the vicidial.php page. This only works on @@ -24,7 +25,23 @@ quit lines must be added to the extensions.conf for this to work: (_X48600XXX, _X38600XXX, 8300 [see extensions.conf.sample]) -5. Experimental FastAGI replacement for call_log and VD_hangup AGI scripts +5. Multiple ADMIN_keepalive scripts have been replaced with a single script + ADMIN_keepalive_ALL.pl + Remove all other ADMIN keepalive entries in your crontab and replace + with this one: + ### keepalive script for astguiclient processes + * * * * * /usr/share/astguiclient/ADMIN_keepalive_ALL.pl + +6. /etc/astguiclient.conf has new variables for new functionality including: + - FastAGI_log server settings + - new ADMIN_keepalive_ALL process settings + and comments are added to the astguiclient.conf file + +7. Experimental FastAGI replacement for call_log and VD_hangup AGI scripts: + FastAGI_log.pl + If you want to use it, read the comments at the top of the script + + @@ -35,10 +52,10 @@ been several changes made to the code base and to where some files are stored in the release as well as on your machine. 1. upgrade the MySQL Asterisk database: -mysql -use asterisk -\. /path/from/root/extras/upgrade_2.0.1.sql -quit + mysql + use asterisk + \. /path/from/root/extras/upgrade_2.0.1.sql + quit 2. use the new installer for astguiclient-VICIDIAL files: @@ -47,7 +64,7 @@ quit old AST_SERVER_conf.pl file that has been removed. Also, this settings file is used by dbconnect.php scripts so no need to manually edit them -perl install.pl + perl install.pl 3. Make sure you have MySQL clientlibs installed: diff --git a/bin/ADMIN_keepalive_ALL.pl b/bin/ADMIN_keepalive_ALL.pl index 7173d7ae..2dfeffe7 100644 --- a/bin/ADMIN_keepalive_ALL.pl +++ b/bin/ADMIN_keepalive_ALL.pl @@ -101,20 +101,37 @@ $runningAST_VDauto_dial=0; $runningAST_VDremote_agents=0; $runningAST_VDadapt=0; $runningFastAGI_log=0; -$launchAST_update=0; -$launchAST_send=0; -$launchAST_listen=0; -$launchAST_VDauto_dial=0; -$launchAST_VDremote_agents=0; -$launchAST_VDadapt=0; -$launchFastAGI_log=0; -if ($VARactive_keepalives =~ /1/) {$AST_update=1;} -if ($VARactive_keepalives =~ /2/) {$AST_send_listen=1;} -if ($VARactive_keepalives =~ /3/) {$AST_VDauto_dial=1;} -if ($VARactive_keepalives =~ /4/) {$AST_VDremote_agents=1;} -if ($VARactive_keepalives =~ /5/) {$AST_VDadapt=1;} -if ($VARactive_keepalives =~ /6/) {$FastAGI_log=1;} +if ($VARactive_keepalives =~ /1/) + { + $AST_update=1; + if ($DB) {print "AST_update set to keepalive\n";} + } +if ($VARactive_keepalives =~ /2/) + { + $AST_send_listen=1; + if ($DB) {print "AST_send_listen set to keepalive\n";} + } +if ($VARactive_keepalives =~ /3/) + { + $AST_VDauto_dial=1; + if ($DB) {print "AST_VDauto_dial set to keepalive\n";} + } +if ($VARactive_keepalives =~ /4/) + { + $AST_VDremote_agents=1; + if ($DB) {print "AST_VDremote_agents set to keepalive\n";} + } +if ($VARactive_keepalives =~ /5/) + { + $AST_VDadapt=1; + if ($DB) {print "AST_VDadapt set to keepalive\n";} + } +if ($VARactive_keepalives =~ /6/) + { + $FastAGI_log=1; + if ($DB) {print "FastAGI_log set to keepalive\n";} + } $REGhome = $PATHhome; $REGhome =~ s/\//\\\//gi; @@ -207,12 +224,13 @@ foreach (@psoutput) chomp($psoutput[$i]); if ($DBX) {print "$i|$psoutput[$i]| \n";} @psline = split(/\/usr\/bin\/perl /,$psoutput[$i]); + $psoutput[$i] =~ s/^ *//gi; $psoutput[$i] =~ s/ .*|\n|\r|\t| //gi; - $listen_pid[$runningAST_listen] = $psoutput[$i]; if ($psline[1] =~ /AST_manager_li/) { - if ($DB) {print "AST_listen RUNNING: |$psline[1]|\n";} + $listen_pid[$runningAST_listen] = $psoutput[$i]; + if ($DB) {print "AST_listen RUNNING: |$psline[1]|$listen_pid[$runningAST_listen]|\n";} $runningAST_listen++; } diff --git a/bin/ADMIN_keepalive_AST_send_listen.pl b/bin/ADMIN_keepalive_AST_send_listen.pl index 6af068e1..4edc3d87 100644 --- a/bin/ADMIN_keepalive_AST_send_listen.pl +++ b/bin/ADMIN_keepalive_AST_send_listen.pl @@ -131,11 +131,12 @@ foreach (@psoutput) chomp($psoutput[$i]); if ($DBX) {print "$i|$psoutput[$i]| \n";} @psline = split(/\/usr\/bin\/perl /,$psoutput[$i]); + $psoutput[$i] =~ s/^ *//gi; $psoutput[$i] =~ s/ .*|\n|\r|\t| //gi; - $listen_pid[$running_listen] = $psoutput[$i]; if ($psline[1] =~ /AST_manager_li/) { + $listen_pid[$running_listen] = $psoutput[$i]; if ($DB) {print "LISTEN RUNNING: |$psline[1]|$psoutput[$i]|\n";} $running_listen++; } diff --git a/bin/FastAGI_log.pl b/bin/FastAGI_log.pl index 8a0891e0..3eabb931 100644 --- a/bin/FastAGI_log.pl +++ b/bin/FastAGI_log.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# TEST_VDfastAGI.pl version 0.01 *DBI-version* +# FastAGI_log.pl version 0.01 *DBI-version* # # Experimental Deamon using perl Net::Server that runs as FastAGI to reduce load # replaces the following AGI scripts: diff --git a/docs/BASE_INSTALL.txt b/docs/BASE_INSTALL.txt index 910ffc2b..56d9f736 100644 --- a/docs/BASE_INSTALL.txt +++ b/docs/BASE_INSTALL.txt @@ -459,20 +459,8 @@ AST_CRON_mix_recordings_BASIC.pl file in it's place) ### recording mixing for Asterisk run every 5 minutes 1,6,11,16,21,26,31,36,41,46,51,56 * * * 1,2,3,4,5,6 /usr/share/astguiclient/AST_CRON_mix_recordings_BASIC.pl -### keepalive script for Asterisk updaters -* * * * * /usr/share/astguiclient/ADMIN_keepalive_AST_update.pl - -### keepalive script for Asterisk manager queue system -* * * * * /usr/share/astguiclient/ADMIN_keepalive_AST_send_listen.pl - -### keepalive script for Asterisk VICIDIAL autodial system -* * * * * /usr/share/astguiclient/ADMIN_keepalive_AST_VDautodial.pl - -### keepalive script for VICIDIAL remote agents -* * * * * /usr/share/astguiclient/ADMIN_keepalive_AST_VDremote_agents.pl - -### keepalive script for VICIDIAL predictive script -* * * * * /usr/share/astguiclient/ADMIN_keepalive_AST_VDadapt.pl +### keepalive script for astguiclient processes +* * * * * /usr/share/astguiclient/ADMIN_keepalive_ALL.pl ### kill Hangup script for Asterisk updaters * * * * * /usr/share/astguiclient/AST_manager_kill_hung_congested.pl diff --git a/docs/SCRATCH_INSTALL.txt b/docs/SCRATCH_INSTALL.txt index 44b0d20d..8a4a873d 100644 --- a/docs/SCRATCH_INSTALL.txt +++ b/docs/SCRATCH_INSTALL.txt @@ -2409,20 +2409,8 @@ AST_CRON_mix_recordings_BASIC.pl file in it's place) ### recording mixing for Asterisk run every 5 minutes 1,6,11,16,21,26,31,36,41,46,51,56 * * * 1,2,3,4,5,6 /usr/share/astguiclient/AST_CRON_mix_recordings_BASIC.pl -### keepalive script for Asterisk updaters -* * * * * /usr/share/astguiclient/ADMIN_keepalive_AST_update.pl - -### keepalive script for Asterisk manager queue system -* * * * * /usr/share/astguiclient/ADMIN_keepalive_AST_send_listen.pl - -### keepalive script for Asterisk VICIDIAL autodial system -* * * * * /usr/share/astguiclient/ADMIN_keepalive_AST_VDautodial.pl - -### keepalive script for VICIDIAL remote agents -* * * * * /usr/share/astguiclient/ADMIN_keepalive_AST_VDremote_agents.pl - -### keepalive script for VICIDIAL predictive script -* * * * * /usr/share/astguiclient/ADMIN_keepalive_AST_VDadapt.pl +### keepalive script for astguiclient processes +* * * * * /usr/share/astguiclient/ADMIN_keepalive_ALL.pl ### kill Hangup script for Asterisk updaters * * * * * /usr/share/astguiclient/AST_manager_kill_hung_congested.pl