basedb-cvs

[<tr...@us...>]

Update of /cvsroot/basedb/basedb/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv8779/bin

Modified Files:
	stopBase.php 
Log Message:
more readable handling of timeout

Index: stopBase.php
===================================================================
RCS file: /cvsroot/basedb/basedb/bin/stopBase.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** stopBase.php	10 Feb 2003 08:40:40 -0000	1.3
--- stopBase.php	15 Feb 2003 12:37:38 -0000	1.4
***************
*** 93,103 ****
  		mydie("Unable to initiate shutdown\n");
  
  	ob_implicit_flush(1);
  	$down = $BC->waitForShutdown(10);
  	if(!$down)
  	{
! 		fwrite(STDERR, "Waiting for locks (10 min max): ");
  		// Wait for ten minutes
! 		for($i = 0; !$down && $i < 24; $i++)
  		{
  			fwrite(STDERR, ".");
--- 93,106 ----
  		mydie("Unable to initiate shutdown\n");
  
+ 	$maxwait = 10;
+ 	$maxdots = (int)($maxwait * 60 / 25);
+ 
  	ob_implicit_flush(1);
  	$down = $BC->waitForShutdown(10);
  	if(!$down)
  	{
! 		fwrite(STDERR, "Waiting for locks ($maxwait minutes max): ");
  		// Wait for ten minutes
! 		for($i = 0; !$down && $i < $maxdots; $i++)
  		{
  			fwrite(STDERR, ".");
***************
*** 108,113 ****
  	if(!$down)
  	{
! 		mydie("Timed out after 10 minutes. ".
! 			"Manual intervention will be needed.\n");
  	}
  	echo "BASE was successfully shut down.\n";
--- 111,117 ----
  	if(!$down)
  	{
! 		mydie("Timed out after $maxwait minutes. ".
! 			"Manual intervention may be needed to restore database ".
! 			"integrity.\n");
  	}
  	echo "BASE was successfully shut down.\n";