[LON-CAPA-cvs] cvs: loncom / loncron

[albertel]

albertel		Fri Jan 27 16:27:15 2006 EDT

  Modified files:              
    /loncom	loncron 
  Log:
  - by default no longer test the connections every night
  - by default do cause lonc/d/apache to do a reload everynight
  
  
  
Index: loncom/loncron
diff -u loncom/loncron:1.62 loncom/loncron:1.63
--- loncom/loncron:1.62	Thu Nov 10 14:07:01 2005
+++ loncom/loncron	Fri Jan 27 16:27:15 2006
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.62 2005/11/10 19:07:01 albertel Exp $
+# $Id: loncron,v 1.63 2006/01/27 21:27:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -112,6 +112,7 @@
 sub checkon_daemon {
     my ($fh,$daemon,$maxsize,$send,$args)=@_;
 
+    my $result;
     &log($fh,'<hr /><a name="'.$daemon.'" /><h2>'.$daemon.'</h2><h3>Log</h3><p style="white-space: pre;"><tt>');
     printf("%-15s ",$daemon);
     if (-e "$perlvar{'lonDaemons'}/logs/$daemon.log"){
@@ -142,8 +143,10 @@
 	    if ($send eq 'USR2') { kill USR2 => $daemonpid; }
 	    $restartflag=0;
 	    if ($send eq 'USR2') {
+		$result = 'reloaded';
 		print "reloaded\n";
 	    } else {
+		$result = 'running';
 		print "running\n";
 	    }
 	} else {
@@ -169,6 +172,7 @@
 	if (&start_daemon($fh,$daemon,$pidfile,$args)) {
 	    &log($fh,"<h3>$daemon at pid $daemonpid responding</h3>");
 	    $simplestatus{$daemon}='restarted';
+	    $result = 'started';
 	    print "started\n";
 	} else {
 	    $errors++;
@@ -178,8 +182,10 @@
 	    if (&start_daemon($fh,$daemon,$pidfile,$args)) {
 		&log($fh,"<h3>$daemon at pid $daemonpid responding</h3>");
 		$simplestatus{$daemon}='restarted';
+		$result = 'started';
 		print "started\n";
 	    } else {
+		$result = 'failed';
 		print " failed\n";
 		$simplestatus{$daemon}='failed';
 		$errors++; $errors++;
@@ -216,6 +222,7 @@
     }
 
     &errout($fh);
+    return $result;
 }
 
 # --------------------------------------------------------------------- Machine
@@ -695,10 +702,14 @@
     }
     if (!$justcheckconnections && !$justreload) {
 	&checkon_daemon($fh,'lonsql',200000);
-	&checkon_daemon($fh,'lond',40000,'USR1');
+	if ( &checkon_daemon($fh,'lond',40000,'USR1') eq 'running') {
+	    &checkon_daemon($fh,'lond',40000,'USR2');
+	}
 	my $args='new';
 	if ($oldlonc) { $args = ''; }
-	&checkon_daemon($fh,'lonc',40000,'USR1',$args);
+	if ( &checkon_daemon($fh,'lonc',40000,'USR1',$args) eq 'running') {
+	    &checkon_daemon($fh,'lond',40000,'USR2',$args);
+	}
 	&checkon_daemon($fh,'lonhttpd',40000);
 	&checkon_daemon($fh,'lonmemcached',40000);
     }
@@ -708,7 +719,7 @@
 	if ($oldlonc) { $args = ''; }
 	&checkon_daemon($fh,'lonc',40000,'USR2',$args);
     }
-    if (!$justcheckdaemons && !$justreload) {
+    if ($justcheckconnections) {
 	&test_connections($fh,\%hostname);
     }
     if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {