--- loncom/loncron	2004/05/11 21:08:55	1.49
+++ loncom/loncron	2004/06/09 13:30:41	1.53
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.49 2004/05/11 21:08:55 albertel Exp $
+# $Id: loncron,v 1.53 2004/06/09 13:30:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -77,13 +77,21 @@ ENDERROUT
 }
 
 sub start_daemon {
-    my ($fh,$daemon,$pidfile) = @_;
+    my ($fh,$daemon,$pidfile,$args) = @_;
     my $progname=$daemon;
-    if ($daemon eq 'lonc' && $ARGV[0] eq 'new') {
+    if ($daemon eq 'lonc' && $args eq 'new') {
 	$progname='loncnew'; 
 	print "new ";
     }
-    system("$perlvar{'lonDaemons'}/$progname 2>>$perlvar{'lonDaemons'}/logs/${daemon}_errors");
+    my $error_fname="$perlvar{'lonDaemons'}/logs/${daemon}_errors";
+    my $size=(stat($error_fname))[7];
+    if ($size>40000) {
+	&log($fh,"<p>Rotating error logs ...</p>");
+	rename("$error_fname.2","$error_fname.3");
+	rename("$error_fname.1","$error_fname.2");
+	rename("$error_fname","$error_fname.1");
+    }
+    system("$perlvar{'lonDaemons'}/$progname 2>$perlvar{'lonDaemons'}/logs/${daemon}_errors");
     sleep 2;
     if (-e $pidfile) {
 	&log($fh,"<p>Seems like it started ...</p>");
@@ -103,7 +111,7 @@ sub start_daemon {
 }
 
 sub checkon_daemon {
-    my ($fh,$daemon,$maxsize,$sendusr1)=@_;
+    my ($fh,$daemon,$maxsize,$sendusr1,$args)=@_;
 
     &log($fh,'<hr /><a name="'.$daemon.'" /><h2>'.$daemon.'</h2><h3>Log</h3><p style="white-space: pre;"><tt>');
     printf("%-10s ",$daemon);
@@ -152,7 +160,7 @@ sub checkon_daemon {
 	    '</font><br>');
 	&log($fh,"<h3>$daemon not running, trying to start</h3>");
 	
-	if (&start_daemon($fh,$daemon,$pidfile)) {
+	if (&start_daemon($fh,$daemon,$pidfile,$args)) {
 	    &log($fh,"<h3>$daemon at pid $daemonpid responding</h3>");
 	    $simplestatus{$daemon}='restarted';
 	    print "started\n";
@@ -161,7 +169,7 @@ sub checkon_daemon {
 	    &log($fh,"<h3>$daemon at pid $daemonpid not responding</h3>");
 	    &log($fh,"<p>Give it one more try ...</p>");
 	    print " ";
-	    if (&start_daemon($fh,$daemon,$pidfile)) {
+	    if (&start_daemon($fh,$daemon,$pidfile,$args)) {
 		&log($fh,"<h3>$daemon at pid $daemonpid responding</h3>");
 		$simplestatus{$daemon}='restarted';
 		print "started\n";
@@ -252,7 +260,7 @@ sub log_machine_info {
     &log($fh,"<pre>");
     my $psproc=0;
 
-    open (PSH,"ps -aux --cols 140 |");
+    open (PSH,"ps aux --cols 140 |");
     while (my $line=<PSH>) { 
 	&log($fh,&encode_entities($line,'<>&"')); 
 	$psproc++;
@@ -465,6 +473,8 @@ sub test_connections {
 	    if ($answer eq 'con_lost') {
 		$bad++;
 		$warnings++;
+	    } else {
+		$good++; #self connection
 	    }
 	}
 	if ($answer =~ /con_lost/) { print(" $tryserver down\n"); }
@@ -548,7 +558,11 @@ sub send_mail {
 	$emailto.=",$perlvar{'lonSysEMail'}";
     }
     my $subj="LON: $perlvar{'lonHostID'} E:$errors W:$warnings N:$notices"; 
-    system("metasend -b -t $emailto -s '$subj' -f $statusdir/index.html -m text/html");
+
+    my $result=system("metasend -b -t $emailto -s '$subj' -f $statusdir/index.html -m text/html >& /dev/null");
+    if ($result != 0) {
+	$result=system("mail -s '$subj' $emailto < $statusdir/index.html");
+    }
 }
 
 sub usage {
@@ -659,7 +673,9 @@ sub main () {
     if (!$justcheckconnections) {
 	&checkon_daemon($fh,'lonsql',200000);
 	&checkon_daemon($fh,'lond',40000,1);
-	&checkon_daemon($fh,'lonc',40000,1);
+	my $args='new';
+	if ($oldlonc) { $args = ''; }
+	&checkon_daemon($fh,'lonc',40000,1,$args);
 	&checkon_daemon($fh,'lonhttpd',40000);
     }
     if (!$justcheckdaemons) {