From 23fa6682ba0a78645a674e00b37e885d29c5ab6c Mon Sep 17 00:00:00 2001
From: mattf <mattf@3d104415-ff17-0410-8863-d5cf3c621b8a>
Date: Fri, 13 Aug 2010 09:18:08 +0000
Subject: [PATCH] small fixes to conf 3way script

git-svn-id: svn://192.168.202.10@1500 3d104415-ff17-0410-8863-d5cf3c621b8a
---
 bin/ADMIN_keepalive_ALL.pl  | 21 +++++++++++++++++++--
 bin/AST_conf_update_3way.pl |  9 ++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/bin/ADMIN_keepalive_ALL.pl b/bin/ADMIN_keepalive_ALL.pl
index 9536e476..e25e879b 100644
--- a/bin/ADMIN_keepalive_ALL.pl
+++ b/bin/ADMIN_keepalive_ALL.pl
@@ -54,6 +54,7 @@
 # 100616-2245 - Added VIDPROMPT options for call menus, changed INGROUP TIMECHECK routes to special extension like AGI
 # 100703-2137 - Added memory table reset nightly
 # 100811-2221 - Added --cu3way flag for new optional leave3way cleaning script
+# 100812-0515 - Added --cu3way-delay= flag for setting delay in the leave3way cleaning script
 #
 
 $DB=0; # Debug flag
@@ -72,7 +73,7 @@ if ($min < 10) {$min = "0$min";}
 if ($sec < 10) {$sec = "0$sec";}
 $now_date = "$year-$mon-$mday $hour:$min:$sec";
 $reset_test = "$hour$min";
-
+$cu3way_delay='';
 
 ### begin parsing run-time options ###
 if (length($ARGV[0])>1)
@@ -89,6 +90,7 @@ if (length($ARGV[0])>1)
 		print "allowed run time options:\n";
 		print "  [-t] = test\n";
 		print "  [-cu3way] = keepalive for the optional 3way conference checker\n";
+		print "  [-cu3way-delay=X] = setting delay seconds on 3way conference checker\n";
 		print "  [-debug] = verbose debug messages\n";
 		print "  [-debugX] = Extra-verbose debug messages\n";
 		print "  [-debugXXX] = Triple-Extra-verbose debug messages\n";
@@ -116,6 +118,21 @@ if (length($ARGV[0])>1)
 			$cu3way=1;
 			if ($DB > 0) {print "\n----- cu3way ENABLED -----\n\n";}
 			}
+		if ($args =~ /-cu3way-delay=/i) # CLI defined delay
+			{
+			@CLIvarARY = split(/-cu3way-delay=/,$args);
+			@CLIvarARX = split(/ /,$CLIvarARY[1]);
+			if (length($CLIvarARX[0])>0)
+				{
+				$CLIdelay = $CLIvarARX[0];
+				$CLIdelay =~ s/\/$| |\r|\n|\t//gi;
+				$CLIdelay =~ s/\D//gi;
+				if ( ($CLIdelay > 0) && (length($CLIdelay)> 0) )	
+					{$cu3way_delay = "--delay=$CLIdelay";}
+				if ($DB > 0) {print "Delay set to $CLIdelay $cu3way_delay\n";}
+				}
+			@CLIvarARY=@MT;   @CLIvarARY=@MT;
+			}
 		if ($args =~ /-t/i)
 			{
 			$TEST=1;
@@ -520,7 +537,7 @@ if (
 		{ 
 		if ($DB) {print "starting AST_conf_3way...\n";}
 		# add a '-L' to the command below to activate logging
-		`/usr/bin/screen -d -m -S ASTconf3way $PATHhome/AST_conf_update_3way.pl --debug`;
+		`/usr/bin/screen -d -m -S ASTconf3way $PATHhome/AST_conf_update_3way.pl --debug $cu3way_delay`;
 		}
 
 	}
diff --git a/bin/AST_conf_update_3way.pl b/bin/AST_conf_update_3way.pl
index 4b946a92..aa55fa35 100644
--- a/bin/AST_conf_update_3way.pl
+++ b/bin/AST_conf_update_3way.pl
@@ -61,19 +61,15 @@ if (length($ARGV[0])>1)
 			{
 			@CLIvarARY = split(/--delay=/,$args);
 			@CLIvarARX = split(/ /,$CLIvarARY[1]);
-			if (length($CLIvarARX[0])>2)
+			if (length($CLIvarARX[0])>0)
 				{
 				$CLIdelay = $CLIvarARX[0];
 				$CLIdelay =~ s/\/$| |\r|\n|\t//gi;
 				$CLIdelay =~ s/\D//gi;
 				if ($DB > 0) {print "Delay set to $CLIdelay\n";}
 				}
-			else
-				{$CLIdelay = '3';}
 			@CLIvarARY=@MT;   @CLIvarARY=@MT;
 			}
-		else
-			{$CLIdelay = '3';}
 
 		if ($args =~ /-t/i)
 			{
@@ -84,12 +80,11 @@ if (length($ARGV[0])>1)
 	}
 else
 	{
-	$CLIdelay = '3';
 	#	print "no command line options set\n";
 	}
 ### end parsing run-time options ###
 
-if ($CLIdelay < 1)		{$CLIdelay = '1';}
+if ( ($CLIdelay < 1) || (length($CLIdelay) < 1) )	{$CLIdelay = '1';}
 
 # default path to astguiclient configuration file:
 $PATHconf =		'/etc/astguiclient.conf';