--- loncom/loncron	2001/02/12 18:53:32	1.16
+++ loncom/loncron	2001/08/27 13:54:50	1.22
@@ -9,13 +9,20 @@
 #
 # 7/14,7/15,7/19,7/21,7/22,11/18,
 # 2/8 Gerd Kortemeyer
-# Dec 00 Scott Harrison
+# 12/6/2000,12/8 Scott Harrison
 # 12/23 Gerd Kortemeyer
-# 02/12/2001 Scott Harrison
+# YEAR=2001
+# 1/10/2001, 2/12/, 2/26, 3/15, 04/11, 04/21,8/27 Scott Harrison
 
 use IO::File;
 use IO::Socket;
 
+my $qflag=0;
+if (@ARGV) {
+    my $arg=shift @ARGV;
+    $qflag=1 if $arg eq 'quick';
+}
+
 # -------------------------------------------------- Non-critical communication
 sub reply {
     my ($cmd,$server)=@_;
@@ -56,6 +63,8 @@ ENDERROUT
            $perlvar{$varname}=$varvalue;
         }
     }
+    delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed
+    delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed
 }
 
 # --------------------------------------- Make sure that LON-CAPA is configured
@@ -275,10 +284,9 @@ print $fh "</pre>";
 
 
 # ---------------------------------------------------------------------- lonsql
-#
-# Do not run for now
-#
-if ($perlvar{'lonRole'} eq "library" && 1==0) {
+
+my $restartflag=1;
+if ($perlvar{'lonRole'} eq "library") {
 
     print $fh '<hr><a name="lonsql"><h2>lonsql</h2><h3>Log</h3><pre>';
     
@@ -302,22 +310,42 @@ if ($perlvar{'lonRole'} eq "library" &&
 	chomp($lonsqlpid);
 	if (kill 0 => $lonsqlpid) {
 	    print $fh "<h3>lonsql at pid $lonsqlpid responding</h3>";
+	    $restartflag=0;
 	} else {
 	    $errors++; $errors++;
 	    print $fh "<h3>lonsql at pid $lonsqlpid not responding</h3>";
+	    # Intelligently handle this.
+	    # Possibility #1: there is no process
+	    # Solution: remove .pid file and restart
+	    if (getpgrp($lonsqlpid)==-1) {
+		unlink($lonsqlfile);
+		$restartflag=1;
+	    }
+	    else {
+		# Possibility #2: there is a live process that is not
+		# responding for an unknown reason
+		# Solution: kill parent and children processes, remove .pid
+		# and restart
+		`killall -9 lonsql`;
+		unlink($lonsqlfile);
+		$restartflag=1;
+	    }
 	}
-    } else {
+	print $fh 
+	    "<h3>Deciding to clean up stale .pid file and restart lonsql</h3>";
+    }
+    if ($restartflag==1) {
 	$errors++;
 	print $fh "<h3>lonsql not running, trying to start</h3>";
 	system(
  "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors");
-	sleep 120;
+	sleep 120 unless $qflag;
 	if (-e $lonsqlfile) {
 	    print $fh "Seems like it started ...<p>";
 	    my $lfh=IO::File->new("$lonsqlfile");
 	    my $lonsqlpid=<$lfh>;
 	    chomp($lonsqlpid);
-	    sleep 30;
+	    sleep 30 unless $qflag;
 	    if (kill 0 => $lonsqlpid) {
 		print $fh "<h3>lonsql at pid $lonsqlpid responding</h3>";
 	    } else {
@@ -326,7 +354,7 @@ if ($perlvar{'lonRole'} eq "library" &&
 		print $fh "Give it one more try ...<p>";
 		system(
  "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors");
-		sleep 120;
+		sleep 120 unless $qflag;
 	    }
 	} else {
 	    print $fh "Seems like that did not work!<p>";
@@ -379,7 +407,7 @@ print $fh "</pre>";
 
 my $londfile="$perlvar{'lonDaemons'}/logs/lond.pid";
 
-my $restartflag=1;
+$restartflag=1;
 if (-e $londfile) {    
    my $lfh=IO::File->new("$londfile");
    my $londpid=<$lfh>;
@@ -414,13 +442,13 @@ if ($restartflag==1) {
    print $fh "<h3>lond not running, trying to start</h3>";
    system(
      "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors");
-   sleep 120;
+   sleep 120 unless $qflag;
    if (-e $londfile) {
        print $fh "Seems like it started ...<p>";
        my $lfh=IO::File->new("$londfile");
        my $londpid=<$lfh>;
        chomp($londpid);
-       sleep 30;
+       sleep 30 unless $qflag;
        if (kill 0 => $londpid) {
           print $fh "<h3>lond at pid $londpid responding</h3>";
        } else {
@@ -429,7 +457,7 @@ if ($restartflag==1) {
           print $fh "Give it one more try ...<p>";
 	  system(
  "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors");
-          sleep 120;
+          sleep 120 unless $qflag;
        }
    } else {
        print $fh "Seems like that did not work!<p>";
@@ -516,14 +544,14 @@ if ($restartflag==1) {
    $errors++;
    print $fh "<h3>lonc not running, trying to start</h3>";
 	system(
- "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");
-   sleep 120;
+ "$perlvar{'lonDaemons'}/lonc 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");
+   sleep 120 unless $qflag;
    if (-e $loncfile) {
        print $fh "Seems like it started ...<p>";
        my $lfh=IO::File->new("$loncfile");
        my $loncpid=<$lfh>;
        chomp($loncpid);
-       sleep 30;
+       sleep 30 unless $qflag;
        if (kill 0 => $loncpid) {
           print $fh "<h3>lonc at pid $loncpid responding</h3>";
        } else {
@@ -531,8 +559,8 @@ if ($restartflag==1) {
           print $fh "<h3>lonc at pid $loncpid not responding</h3>";
           print $fh "Give it one more try ...<p>";
  	  system(
- "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");
-          sleep 120;
+ "$perlvar{'lonDaemons'}/lonc 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");
+          sleep 120 unless $qflag;
        }
    } else {
        print $fh "Seems like that did not work!<p>";
@@ -672,7 +700,8 @@ if ($totalcount>200) {
    $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
    $subj="LON: $perlvar{'lonHostID'} E:$errors W:$warnings N:$notices"; 
    system(
- "metasend -b -t $emailto -s '$subj' -f $statusdir/index.html -m text/html");
+ "metasend -b -t $emailto -s '$subj' -f $statusdir/index.html -m text/html")
+    unless $qflag;
 }
 1;