[LON-CAPA-cvs] cvs: loncom / loncron /init.d loncontrol

[albertel]

albertel		Mon Jun 13 15:54:30 2005 EDT

  Modified files:              
    /loncom/init.d	loncontrol 
    /loncom	loncron 
  Log:
  - making it sleep for less time
  
  
Index: loncom/init.d/loncontrol
diff -u loncom/init.d/loncontrol:1.25 loncom/init.d/loncontrol:1.26
--- loncom/init.d/loncontrol:1.25	Thu May 26 16:25:00 2005
+++ loncom/init.d/loncontrol	Mon Jun 13 15:54:28 2005
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: loncontrol,v 1.25 2005/05/26 20:25:00 albertel Exp $
+# $Id: loncontrol,v 1.26 2005/06/13 19:54:28 albertel Exp $
 #
 # The LearningOnline Network with CAPA
 #
@@ -128,10 +128,10 @@
 	my $daemonpid=<PIDFILE>;
 	chomp($daemonpid);
 	kill TERM => $daemonpid;
-	sleep 2;
+	sleep 1;
 	if (kill 0 => $daemonpid) {
 	    kill KILL => $daemonpid;
-	    sleep 2;
+	    sleep 1;
 	    if (kill 0 => $daemonpid) {
 		print("failed to kill");
 	    } else {
Index: loncom/loncron
diff -u loncom/loncron:1.59 loncom/loncron:1.60
--- loncom/loncron:1.59	Thu May 26 16:25:00 2005
+++ loncom/loncron	Mon Jun 13 15:54:28 2005
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.59 2005/05/26 20:25:00 albertel Exp $
+# $Id: loncron,v 1.60 2005/06/13 19:54:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -92,13 +92,12 @@
 	rename("$error_fname","$error_fname.1");
     }
     system("$perlvar{'lonDaemons'}/$progname 2>$perlvar{'lonDaemons'}/logs/${daemon}_errors");
-    sleep 2;
+    sleep 1;
     if (-e $pidfile) {
 	&log($fh,"<p>Seems like it started ...</p>");
 	my $lfh=IO::File->new("$pidfile");
 	my $daemonpid=<$lfh>;
 	chomp($daemonpid);
-	sleep 2;
 	if (kill 0 => $daemonpid) {
 	    return 1;
 	} else {
@@ -161,7 +160,7 @@
 	if ($kadaemon eq 'lonmemcached') { $kadaemon='memcached'; }
 	&log($fh,'<br><font color="red">Killall '.$daemon.': '.
 	    `killall $kadaemon 2>&1`.' - ');
-	sleep 2;
+	sleep 1;
 	&log($fh,unlink($pidfile).' - '.
 	    `killall -9 $kadaemon 2>&1`.
 	    '</font><br>');