--- loncom/loncron	2001/01/10 17:20:44	1.12
+++ loncom/loncron	2001/08/27 13:54:50	1.22
@@ -9,12 +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
+# 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)=@_;
@@ -45,13 +53,6 @@ ENDERROUT
 
 # ================================================================ Main Program
 
-# ----------------------------- Make sure this process is running from user=www
-my $wwwid=getpwnam('www');
-if ($wwwid!=$<) {
-    print("User ID mismatch.  This program must be run as user 'www'\n") unless $noprint;
-    exit 1;
-}
-
 # ------------------------------------------------------------ Read access.conf
 {
     my $config=IO::File->new("/etc/httpd/conf/access.conf");
@@ -62,6 +63,33 @@ if ($wwwid!=$<) {
            $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
+# I only test for one thing here (lonHostID).  This is just a safeguard.
+if ('{[[[[lonHostID]]]]}' eq $perlvar{'lonHostID'}) {
+   print("Unconfigured machine.\n");
+   $emailto=$perlvar{'lonSysEMail'};
+   $hostname=`/bin/hostname`;
+   chop $hostname;
+   $hostname=~s/[^\w\.]//g; # make sure is safe to pass through shell
+   $subj="LON: Unconfigured machine $hostname";
+   system("echo 'Unconfigured machine $hostname.' |\
+ mailto $emailto -s '$subj' > /dev/null");
+    exit 1;
+}
+
+# ----------------------------- Make sure this process is running from user=www
+my $wwwid=getpwnam('www');
+if ($wwwid!=$<) {
+   print("User ID mismatch.  This program must be run as user 'www'\n");
+   $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
+   $subj="LON: $perlvar{'lonHostID'} User ID mismatch";
+   system("echo 'User ID mismatch.  loncron must be run as user www.' |\
+ mailto $emailto -s '$subj' > /dev/null");
+   exit 1;
 }
 
 # ------------------------------------------------------------- Read hosts file
@@ -256,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>';
     
@@ -283,29 +310,51 @@ 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");
-	sleep 120;
+	system(
+ "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors");
+	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 {
 		$errors++; $errors++;
 		print $fh "<h3>lonsql at pid $lonsqlpid not responding</h3>";
 		print $fh "Give it one more try ...<p>";
-		system("$perlvar{'lonDaemons'}/lonsql");
-		sleep 120;
+		system(
+ "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors");
+		sleep 120 unless $qflag;
 	    }
 	} else {
 	    print $fh "Seems like that did not work!<p>";
@@ -358,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>;
@@ -391,22 +440,24 @@ if (-e $londfile) {
 if ($restartflag==1) {
    $errors++;
    print $fh "<h3>lond not running, trying to start</h3>";
-   system("$perlvar{'lonDaemons'}/lond");
-   sleep 120;
+   system(
+     "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors");
+   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 {
           $errors++; $errors++;
           print $fh "<h3>lond at pid $londpid not responding</h3>";
           print $fh "Give it one more try ...<p>";
-          system("$perlvar{'lonDaemons'}/lond");
-          sleep 120;
+	  system(
+ "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors");
+          sleep 120 unless $qflag;
        }
    } else {
        print $fh "Seems like that did not work!<p>";
@@ -492,22 +543,24 @@ if (-e $loncfile) {
 if ($restartflag==1) {
    $errors++;
    print $fh "<h3>lonc not running, trying to start</h3>";
-   system("$perlvar{'lonDaemons'}/lonc");
-   sleep 120;
+	system(
+ "$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 {
           $errors++; $errors++;
           print $fh "<h3>lonc at pid $loncpid not responding</h3>";
           print $fh "Give it one more try ...<p>";
-          system("$perlvar{'lonDaemons'}/lonc");
-          sleep 120;
+ 	  system(
+ "$perlvar{'lonDaemons'}/lonc 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");
+          sleep 120 unless $qflag;
        }
    } else {
        print $fh "Seems like that did not work!<p>";
@@ -647,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;