--- loncom/loncron	2001/01/10 17:49:56	1.14
+++ loncom/loncron	2001/04/21 15:22:37	1.20
@@ -9,12 +9,19 @@
 #
 # 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
+# 1/10/2001, 2/12/, 2/26, 3/15, 04/11, 04/21 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)=@_;
@@ -55,12 +62,14 @@ 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
 # I only test for one thing here (lonHostID).  This is just a safeguard.
 if ('{[[[[lonHostID]]]]}' eq $perlvar{'lonHostID'}) {
-   print("User ID mismatch.  This program must be run as user 'www'\n");
+   print("Unconfigured machine.\n");
    $emailto=$perlvar{'lonSysEMail'};
    $hostname=`/bin/hostname`;
    chop $hostname;
@@ -277,7 +286,7 @@ print $fh "</pre>";
 #
 # Do not run for now
 #
-if ($perlvar{'lonRole'} eq "library" && 1==0) {
+if ($perlvar{'lonRole'} eq "library") {
 
     print $fh '<hr><a name="lonsql"><h2>lonsql</h2><h3>Log</h3><pre>';
     
@@ -308,22 +317,24 @@ if ($perlvar{'lonRole'} eq "library" &&
     } else {
 	$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>";
@@ -409,22 +420,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>";
@@ -510,22 +523,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>";