--- loncom/loncron	2006/01/27 21:30:53	1.64
+++ loncom/loncron	2017/02/28 05:42:06	1.104
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.64 2006/01/27 21:30:53 albertel Exp $
+# $Id: loncron,v 1.104 2017/02/28 05:42:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,32 +32,23 @@ use strict;
 
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
+use LONCAPA::Checksumming;
+use LONCAPA;
+use Apache::lonnet;
+use Apache::loncommon;
 
 use IO::File;
 use IO::Socket;
 use HTML::Entities;
 use Getopt::Long;
+use GDBM_File;
+use Storable qw(thaw);
 #globals
 use vars qw (%perlvar %simplestatus $errors $warnings $notices $totalcount);
 
 my $statusdir="/home/httpd/html/lon-status";
 
 
-# -------------------------------------------------- Non-critical communication
-sub reply {
-    my ($cmd,$server,$hostname)=@_;
-    my $peerfile="$perlvar{'lonSockDir'}/".$hostname->{$server};
-    my $client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
-                                     Type    => SOCK_STREAM,
-                                     Timeout => 10)
-       or return "con_lost";
-    print $client "sethost:$server:$cmd\n";
-    my $answer=<$client>;
-    chomp($answer);
-    if (!$answer) { $answer="con_lost"; }
-    return $answer;
-}
-
 # --------------------------------------------------------- Output error status
 
 sub log {
@@ -76,20 +67,27 @@ sub errout {
 ENDERROUT
 }
 
+sub rotate_logfile {
+    my ($file,$fh,$description) = @_;
+    my $size=(stat($file))[7];
+    if ($size>40000) {
+	&log($fh,"<p>Rotating $description ...</p>");
+	rename("$file.2","$file.3");
+	rename("$file.1","$file.2");
+	rename("$file","$file.1");
+    } 
+}
+
 sub start_daemon {
     my ($fh,$daemon,$pidfile,$args) = @_;
     my $progname=$daemon;
-    if ($daemon eq 'lonc' && $args eq 'new') {
+    if ($daemon eq 'lonc') {
 	$progname='loncnew'; 
-	print "new ";
     }
     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");
+    &rotate_logfile($error_fname,$fh,'error logs');
+    if ($daemon eq 'lonc') {
+	&clean_sockets($fh);
     }
     system("$perlvar{'lonDaemons'}/$progname 2>$perlvar{'lonDaemons'}/logs/${daemon}_errors");
     sleep 1;
@@ -161,12 +159,12 @@ sub checkon_daemon {
 	$errors++;
 	my $kadaemon=$daemon;
 	if ($kadaemon eq 'lonmemcached') { $kadaemon='memcached'; }
-	&log($fh,'<br><font color="red">Killall '.$daemon.': '.
+	&log($fh,'<br /><font color="red">Killall '.$daemon.': '.
 	    `killall $kadaemon 2>&1`.' - ');
 	sleep 1;
 	&log($fh,unlink($pidfile).' - '.
 	    `killall -9 $kadaemon 2>&1`.
-	    '</font><br>');
+	    '</font><br />');
 	&log($fh,"<h3>$daemon not running, trying to start</h3>");
 	
 	if (&start_daemon($fh,$daemon,$pidfile,$args)) {
@@ -208,18 +206,7 @@ sub checkon_daemon {
     }
     
     my $fname="$perlvar{'lonDaemons'}/logs/$daemon.log";
-    
-    my ($dev,$ino,$mode,$nlink,
-	$uid,$gid,$rdev,$size,
-	$atime,$mtime,$ctime,
-	$blksize,$blocks)=stat($fname);
-    
-    if ($size>$maxsize) {
-	&log($fh,"<p>Rotating logs ...</p>");
-	rename("$fname.2","$fname.3");
-	rename("$fname.1","$fname.2");
-	rename("$fname","$fname.1");
-    }
+    &rotate_logfile($fname,$fh,'logs');
 
     &errout($fh);
     return $result;
@@ -286,19 +273,13 @@ sub log_machine_info {
 
     &log($fh,"<h3>distprobe</h3>");
     &log($fh,"<pre>");
-    open(DSH,"$perlvar{'lonDaemons'}/distprobe |");
-    while (my $line=<DSH>) { 
-	&log($fh,&encode_entities($line,'<>&"')); 
-	$psproc++;
-    }
-    close(DSH);
+    &log($fh,&encode_entities(&LONCAPA::distro(),'<>&"'));
     &log($fh,"</pre>");
 
     &errout($fh);
 }
 
 sub start_logging {
-    my ($hostdom,$hostrole,$hostname,$spareid)=@_;
     my $fh=IO::File->new(">$statusdir/newstatus.html");
     my %simplestatus=();
     my $now=time;
@@ -306,9 +287,11 @@ sub start_logging {
     
 
     &log($fh,(<<ENDHEADERS));
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <title>LON Status Report $perlvar{'lonHostID'}</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 </head>
 <body bgcolor="#AAAAAA">
 <a name="top" />
@@ -319,11 +302,11 @@ sub start_logging {
 <li><a href="#machine">Machine Information</a></li>
 <li><a href="#tmp">Temporary Files</a></li>
 <li><a href="#tokens">Session Tokens</a></li>
+<li><a href="#webdav">WebDAV Session Tokens</a></li>
 <li><a href="#httpd">httpd</a></li>
 <li><a href="#lonsql">lonsql</a></li>
 <li><a href="#lond">lond</a></li>
 <li><a href="#lonc">lonc</a></li>
-<li><a href="#lonhttpd">lonhttpd</a></li>
 <li><a href="#lonnet">lonnet</a></li>
 <li><a href="#connections">Connections</a></li>
 <li><a href="#delayed">Delayed Messages</a></li>
@@ -341,17 +324,29 @@ ENDHEADERS
 	     &encode_entities($perlvar{$varname},'<>&"')."</td></tr>\n");
     }
     &log($fh,"</table><h3>Hosts</h3><table border='2'>");
-    foreach my $id (sort(keys(%{$hostname}))) {
+    my %hostname = &Apache::lonnet::all_hostnames();
+    foreach my $id (sort(keys(%hostname))) {
+	my $role = (&Apache::lonnet::is_library($id) ? 'library'
+		                                     : 'access');
 	&log($fh,
-	    "<tr><td>$id</td><td>".$hostdom->{$id}.
-	    "</td><td>".$hostrole->{$id}.
-	    "</td><td>".$hostname->{$id}."</td></tr>\n");
-    }
-    &log($fh,"</table><h3>Spare Hosts</h3><ol>");
-    foreach my $id (sort(keys(%{$spareid}))) {
-	&log($fh,"<li>$id\n</li>");
+	    "<tr><td>$id</td><td>".&Apache::lonnet::host_domain($id).
+	    "</td><td>".$role.
+	    "</td><td>".&Apache::lonnet::hostname($id)."</td></tr>\n");
+    }
+    &log($fh,"</table><h3>Spare Hosts</h3>");
+    if (keys(%Apache::lonnet::spareid) > 0) {
+        &log($fh,"<ul>");
+        foreach my $type (sort(keys(%Apache::lonnet::spareid))) {
+	    &log($fh,"<li>$type\n<ol>");
+	    foreach my $id (@{ $Apache::lonnet::spareid{$type} }) {
+	        &log($fh,"<li>$id</li>\n");
+	    }
+	    &log($fh,"</ol>\n</li>\n");
+        }
+        &log($fh,"</ul>\n");
+    } else {
+        &log($fh,"No spare hosts specified<br />\n");
     }
-    &log($fh,"</ol>\n");
     return $fh;
 }
 
@@ -359,33 +354,127 @@ ENDHEADERS
 sub clean_tmp {
     my ($fh)=@_;
     &log($fh,'<hr /><a name="tmp" /><h2>Temporary Files</h2>');
-    my $cleaned=0;
-    my $old=0;
-    while (my $fname=<$perlvar{'lonDaemons'}/tmp/*>) {
-	my ($dev,$ino,$mode,$nlink,
-	    $uid,$gid,$rdev,$size,
-	    $atime,$mtime,$ctime,
-	    $blksize,$blocks)=stat($fname);
-	my $now=time;
-	my $since=$now-$mtime;
-	if ($since>$perlvar{'lonExpire'}) {
-	    my $line='';
-	    if (open(PROBE,$fname)) {
-		$line=<PROBE>;
-		close(PROBE);
-	    }
-	    unless ($line=~/^CHECKOUTTOKEN\&/) {
-		$cleaned++;
-		unlink("$fname");
-	    } else {
-		if ($since>365*$perlvar{'lonExpire'}) {
-		    $cleaned++;
-		    unlink("$fname");
-		} else { $old++; }
-	    }
-	}
+    my ($cleaned,$old,$removed) = (0,0,0);
+    my %errors = (
+                     dir       => [],
+                     file      => [],
+                     failopen  => [],
+                 );
+    my %error_titles = (
+                         dir       => 'failed to remove empty directory:',
+                         file      => 'failed to unlike stale file',
+                         failopen  => 'failed to open file or directory'
+                       );
+    ($cleaned,$old,$removed) = &recursive_clean_tmp('',$cleaned,$old,$removed,\%errors);
+    &log($fh,"Cleaned up: ".$cleaned." files; removed: $removed empty directories; (found: $old old checkout tokens)");
+    foreach my $key (sort(keys(%errors))) {
+        if (ref($errors{$key}) eq 'ARRAY') {
+            if (@{$errors{$key}} > 0) {
+                &log($fh,"Error during cleanup ($error_titles{$key}):<ul><li>".
+                     join('</li><li><tt>',@{$errors{$key}}).'</tt></li></ul><br />');
+            }
+        }
+    }
+}
+
+sub recursive_clean_tmp {
+    my ($subdir,$cleaned,$old,$removed,$errors) = @_;
+    my $base = "$perlvar{'lonDaemons'}/tmp";
+    my $path = $base;
+    next if ($subdir =~ m{\.\./});
+    next unless (ref($errors) eq 'HASH');
+    unless ($subdir eq '') {
+        $path .= '/'.$subdir;
+    }
+    if (opendir(my $dh,"$path")) {
+        while (my $file = readdir($dh)) {
+            next if ($file =~ /^\.\.?$/);
+            my $fname = "$path/$file";
+            if (-d $fname) {
+                my $innerdir;
+                if ($subdir eq '') {
+                    $innerdir = $file;
+                } else {
+                    $innerdir = $subdir.'/'.$file;
+                }
+                ($cleaned,$old,$removed) = 
+                     &recursive_clean_tmp($innerdir,$cleaned,$old,$removed,$errors);
+                my @doms = &Apache::lonnet::current_machine_domains();
+                
+                if (open(my $dirhandle,$fname)) {
+                    unless (($innerdir eq 'helprequests') ||
+                            (($innerdir =~ /^addcourse/) && ($innerdir !~ m{/\d+$}))) {
+                        my @contents = grep {!/^\.\.?$/} readdir($dirhandle);
+                                      join('&&',@contents)."\n";    
+                        if (scalar(grep {!/^\.\.?$/} readdir($dirhandle)) == 0) {
+                            closedir($dirhandle);
+                            if ($fname =~ m{^\Q$perlvar{'lonDaemons'}\E/tmp/}) {
+                                if (rmdir($fname)) {
+                                    $removed ++;
+                                } elsif (ref($errors->{dir}) eq 'ARRAY') {
+                                    push(@{$errors->{dir}},$fname);
+                                }
+                            }
+                        }
+                    } else {
+                        closedir($dirhandle);
+                    }
+                }
+            } else {
+                my ($dev,$ino,$mode,$nlink,
+                    $uid,$gid,$rdev,$size,
+                    $atime,$mtime,$ctime,
+                    $blksize,$blocks)=stat($fname);
+                my $now=time;
+                my $since=$now-$mtime;
+                if ($since>$perlvar{'lonExpire'}) {
+                    if ($subdir eq '') {
+                        my $line='';
+                        if ($fname =~ /\.db$/) {
+                            if (unlink($fname)) {
+                                $cleaned++;
+                            } elsif (ref($errors->{file}) eq 'ARRAY') {
+                                push(@{$errors->{file}},$fname);
+                            }
+                        } elsif (open(PROBE,$fname)) {
+                            my $line='';
+                            $line=<PROBE>;
+                            close(PROBE);
+                            if ($line=~/^CHECKOUTTOKEN\&/) {
+                                if ($since>365*$perlvar{'lonExpire'}) {
+                                    if (unlink($fname)) {
+                                        $cleaned++; 
+                                    } elsif (ref($errors->{file}) eq 'ARRAY') {
+                                        push(@{$errors->{file}},$fname);
+                                    }
+                                } else {
+                                    $old++;
+                                }
+                            } else {
+                                if (unlink($fname)) {
+                                    $cleaned++;
+                                } elsif (ref($errors->{file}) eq 'ARRAY') {
+                                    push(@{$errors->{file}},$fname);
+                                }
+                            }
+                        } elsif (ref($errors->{failopen}) eq 'ARRAY') {
+                            push(@{$errors->{failopen}},$fname); 
+                        }
+                    } else {
+                        if (unlink($fname)) {
+                            $cleaned++;
+                        } elsif (ref($errors->{file}) eq 'ARRAY') {
+                            push(@{$errors->{file}},$fname);
+                        }
+                    }
+                }
+            }
+        }
+        closedir($dh);
+    } elsif (ref($errors->{failopen}) eq 'ARRAY') {
+        push(@{$errors->{failopen}},$path);
     }
-    &log($fh,"Cleaned up ".$cleaned." files (".$old." old checkout tokens).");
+    return ($cleaned,$old,$removed);
 }
 
 # ------------------------------------------------------------ clean out lonIDs
@@ -403,7 +492,7 @@ sub clean_lonIDs {
 	my $since=$now-$mtime;
 	if ($since>$perlvar{'lonExpire'}) {
 	    $cleaned++;
-	    &log($fh,"Unlinking $fname<br>");
+	    &log($fh,"Unlinking $fname<br />");
 	    unlink("$fname");
 	} else {
 	    $active++;
@@ -413,25 +502,58 @@ sub clean_lonIDs {
     &log($fh,"<h3>$active open session(s)</h3>");
 }
 
+# ------------------------------------------------ clean out webDAV Session IDs
+sub clean_webDAV_sessionIDs {
+    my ($fh)=@_;
+    if ($perlvar{'lonRole'} eq 'library') {
+        &log($fh,'<hr /><a name="webdav" /><h2>WebDAV Session Tokens</h2>');
+        my $cleaned=0;
+        my $active=0;
+        my $now = time;
+        if (-d $perlvar{'lonDAVsessDir'}) {
+            while (my $fname=<$perlvar{'lonDAVsessDir'}/*>) {
+                my @stats = stat($fname);
+                my $since=$now-$stats[9];
+                if ($since>$perlvar{'lonExpire'}) {
+                    $cleaned++;
+                    &log($fh,"Unlinking $fname<br />");
+                    unlink("$fname");
+                } else {
+                    $active++;
+                }
+            }
+            &log($fh,"<p>Cleaned up ".$cleaned." stale webDAV session token(s).</p>");
+            &log($fh,"<h3>$active open webDAV session(s)</h3>");
+        }
+    }
+}
+
+# ----------------------------------------------------------- clean out sockets
+sub clean_sockets {
+    my ($fh)=@_;
+    my $cleaned=0;
+    opendir(SOCKETS,$perlvar{'lonSockDir'});
+    while (my $fname=readdir(SOCKETS)) {
+	next if (-d $fname 
+		 || $fname=~/(mysqlsock|maximasock|rsock|\Q$perlvar{'lonSockDir'}\E)/);
+	$cleaned++;
+	&log($fh,"Unlinking $fname<br />");
+	unlink("/home/httpd/sockets/$fname");
+    }
+    &log($fh,"<p>Cleaned up ".$cleaned." stale sockets.</p>");
+}
+
 
 # ----------------------------------------------------------------------- httpd
 sub check_httpd_logs {
     my ($fh)=@_;
-    &log($fh,'<hr /><a name="httpd" /><h2>httpd</h2><h3>Access Log</h3><pre>');
-    
-    open (DFH,"tail -n25 /etc/httpd/logs/access_log|");
-    while (my $line=<DFH>) { &log($fh,&encode_entities($line,'<>&"')) };
-    close (DFH);
-	
-    &log($fh,"</pre><h3>Error Log</h3><pre>");
-	
-    open (DFH,"tail -n25 /etc/httpd/logs/error_log|");
-    while (my $line=<DFH>) { 
-	&log($fh,"$line");
-	if ($line=~/\[error\]/) { $notices++; } 
+    if (open(PIPE,"./lchttpdlogs|")) {
+        while (my $line=<PIPE>) {
+            &log($fh,$line);
+            if ($line=~/\[error\]/) { $notices++; }
+        }
+        close(PIPE);
     }
-    close (DFH);
-    &log($fh,"</pre>");
     &errout($fh);
 }
 
@@ -440,7 +562,7 @@ sub check_httpd_logs {
 sub rotate_lonnet_logs {
     my ($fh)=@_;
     &log($fh,'<hr /><a name="lonnet" /><h2>lonnet</h2><h3>Temp Log</h3><pre>');
-    print "checking logs\n";
+    print "Checking logs.\n";
     if (-e "$perlvar{'lonDaemons'}/logs/lonnet.log"){
 	open (DFH,"tail -n50 $perlvar{'lonDaemons'}/logs/lonnet.log|");
 	while (my $line=<DFH>) { 
@@ -459,34 +581,39 @@ sub rotate_lonnet_logs {
     } else { &log($fh,"No perm log\n") }
 
     my $fname="$perlvar{'lonDaemons'}/logs/lonnet.log";
-
-    my ($dev,$ino,$mode,$nlink,
-	$uid,$gid,$rdev,$size,
-	$atime,$mtime,$ctime,
-	$blksize,$blocks)=stat($fname);
-
-    if ($size>40000) {
-	&log($fh,"<p>Rotating logs ...</p>");
-	rename("$fname.2","$fname.3");
-	rename("$fname.1","$fname.2");
-	rename("$fname","$fname.1");
-    }
+    &rotate_logfile($fname,$fh,'lonnet log');
 
     &log($fh,"</pre>");
     &errout($fh);
 }
 
+sub rotate_other_logs {
+    my ($fh) = @_;
+    my %logs = (
+                  autoenroll          => 'Auto Enroll log',
+                  autocreate          => 'Create Course log',
+                  searchcat           => 'Search Cataloguing log',
+                  autoupdate          => 'Auto Update log',
+                  refreshcourseids_db => 'Refresh CourseIDs db log',
+               );
+    foreach my $item (keys(%logs)) {
+        my $fname=$perlvar{'lonDaemons'}.'/logs/'.$item.'.log';
+        &rotate_logfile($fname,$fh,$logs{$item});
+    }
+}
+
 # ----------------------------------------------------------------- Connections
 sub test_connections {
-    my ($fh,$hostname)=@_;
+    my ($fh)=@_;
     &log($fh,'<hr /><a name="connections" /><h2>Connections</h2>');
-    print "testing connections\n";
+    print "Testing connections.\n";
     &log($fh,"<table border='2'>");
     my ($good,$bad)=(0,0);
-    foreach my $tryserver (sort(keys(%{$hostname}))) {
+    my %hostname = &Apache::lonnet::all_hostnames();
+    foreach my $tryserver (sort(keys(%hostname))) {
 	print(".");
 	my $result;
-	my $answer=reply("ping",$tryserver,$hostname);
+	my $answer=&Apache::lonnet::reply("ping",$tryserver);
 	if ($answer eq "$tryserver:$perlvar{'lonHostID'}") {
 	    $result="<b>ok</b>";
 	    $good++;
@@ -513,7 +640,7 @@ sub test_connections {
 sub check_delayed_msg {
     my ($fh)=@_;
     &log($fh,'<hr /><a name="delayed" /><h2>Delayed Messages</h2>');
-    print "checking buffers\n";
+    print "Checking buffers.\n";
     
     &log($fh,'<h3>Scanning Permanent Log</h3>');
 
@@ -524,7 +651,7 @@ sub check_delayed_msg {
 	my ($time,$sdf,$dserv,$dcmd)=split(/:/,$line);
 	if ($sdf eq 'F') { 
 	    my $local=localtime($time);
-	    &log($fh,"<b>Failed: $time, $dserv, $dcmd</b><br>");
+	    &log($fh,"<b>Failed: $time, $dserv, $dcmd</b><br />");
 	    $warnings++;
 	}
 	if ($sdf eq 'S') { $unsend--; }
@@ -532,17 +659,45 @@ sub check_delayed_msg {
     }
 
     &log($fh,"<p>Total unsend messages: <b>$unsend</b></p>\n");
-    $warnings=$warnings+5*$unsend;
+    if ($unsend > 0) {
+        $warnings=$warnings+5*$unsend;
+    }
 
     if ($unsend) { $simplestatus{'unsend'}=$unsend; }
     &log($fh,"<h3>Outgoing Buffer</h3>\n<pre>");
-
+# list directory with delayed messages and remember offline servers
+    my %servers=();
     open (DFH,"ls -lF $perlvar{'lonSockDir'}/delayed|");
-    while (my $line=<DFH>) { 
+    while (my $line=<DFH>) {
+        my ($server)=($line=~/\.(\w+)$/);
+        if ($server) { $servers{$server}=1; }
 	&log($fh,&encode_entities($line,'<>&"'));
     }
     &log($fh,"</pre>\n");
     close (DFH);
+    my %hostname = &Apache::lonnet::all_hostnames();
+    my $numhosts = scalar(keys(%hostname));
+# pong to all servers that have delayed messages
+# this will trigger a reverse connection, which should flush the buffers
+    foreach my $tryserver (sort(keys(%servers))) {
+        if ($hostname{$tryserver} || !$numhosts) {
+            my $answer;
+            eval {
+                local $SIG{ ALRM } = sub { die "TIMEOUT" };
+                alarm(20);
+                $answer = &Apache::lonnet::reply("pong",$tryserver);
+                alarm(0);
+            };
+            if ($@ && $@ =~ m/TIMEOUT/) {
+                &log($fh,"Attempted pong to $tryserver timed out<br />");
+                print "Time out while contacting: $tryserver for pong.\n";
+            } else {
+                &log($fh,"Pong to $tryserver: $answer<br />");
+            }
+        } else {
+            &log($fh,"$tryserver has delayed messages, but is not part of the cluster -- skipping 'Pong'.<br />");
+        }
+    }
 }
 
 sub finish_logging {
@@ -554,7 +709,7 @@ sub finish_logging {
     my $now=time;
     my $date=localtime($now);
     &log($fh,"<hr />$date ($now)</body></html>\n");
-    print "lon-status webpage updated\n";
+    print "lon-status webpage updated.\n";
     $fh->close();
 
     if ($errors) { $simplestatus{'errors'}=$errors; }
@@ -564,7 +719,7 @@ sub finish_logging {
 }
 
 sub log_simplestatus {
-    rename ("$statusdir/newstatus.html","$statusdir/index.html");
+    rename("$statusdir/newstatus.html","$statusdir/index.html");
     
     my $sfh=IO::File->new(">$statusdir/loncron_simple.txt");
     foreach (keys %simplestatus) {
@@ -574,27 +729,260 @@ sub log_simplestatus {
     $sfh->close();
 }
 
+sub write_loncaparevs {
+    print "Retrieving LON-CAPA version information.\n";
+    my %hostname = &Apache::lonnet::all_hostnames();
+    my $output;
+    foreach my $id (sort(keys(%hostname))) {
+        if ($id ne '') {
+            my $loncaparev;
+            eval {
+                local $SIG{ ALRM } = sub { die "TIMEOUT" };
+                alarm(10);
+                $loncaparev =
+                    &Apache::lonnet::get_server_loncaparev('',$id,1,'loncron');
+                alarm(0);
+            };
+            if ($@ && $@ =~ m/TIMEOUT/) {
+                print "Time out while contacting lonHost: $id for version.\n";   
+            }
+            if ($loncaparev =~ /^[\w.\-]+$/) {
+                $output .= $id.':'.$loncaparev."\n";
+            }
+        }
+    }
+    if ($output) {
+        if (open(my $fh,">$perlvar{'lonTabDir'}/loncaparevs.tab")) {
+            print $fh $output;
+            close($fh);
+            &Apache::lonnet::load_loncaparevs();
+        }
+    }
+    return;
+}
+
+sub write_serverhomeIDs {
+    print "Retrieving LON-CAPA lonHostID information.\n";
+    my %name_to_host = &Apache::lonnet::all_names();
+    my $output;
+    foreach my $name (sort(keys(%name_to_host))) {
+        if ($name ne '') {
+            if (ref($name_to_host{$name}) eq 'ARRAY') {
+                my $serverhomeID;
+                eval {
+                    local $SIG{ ALRM } = sub { die "TIMEOUT" };
+                    alarm(10);
+                    $serverhomeID = 
+                        &Apache::lonnet::get_server_homeID($name,1,'loncron');
+                    alarm(0);
+                };
+                if ($@ && $@ =~ m/TIMEOUT/) {
+                    print "Time out while contacting server: $name\n"; 
+                }
+                if ($serverhomeID ne '') {
+                    $output .= $name.':'.$serverhomeID."\n";
+                } else {
+                    $output .= $name.':'.$name_to_host{$name}->[0]."\n";
+                }
+            }
+        }
+    }
+    if ($output) {
+        if (open(my $fh,">$perlvar{'lonTabDir'}/serverhomeIDs.tab")) {
+            print $fh $output;
+            close($fh);
+            &Apache::lonnet::load_serverhomeIDs();
+        }
+    }
+    return;
+}
+
+sub write_checksums {
+    my $distro = &LONCAPA::distro();
+    if ($distro) {
+        print "Retrieving file version and checksumming.\n";
+        my $numchksums = 0;
+        my ($chksumsref,$versionsref) =
+            &LONCAPA::Checksumming::get_checksums($distro,$perlvar{'lonDaemons'},
+                                                  $perlvar{'lonLib'},
+                                                  $perlvar{'lonIncludes'},
+                                                  $perlvar{'lonTabDir'});
+        if (ref($chksumsref) eq 'HASH') {
+            $numchksums = scalar(keys(%{$chksumsref}));
+        }
+        print "File version retrieved and checksumming completed for $numchksums files.\n";
+    } else {
+        print "File version retrieval and checksumming skipped - could not determine Linux distro.\n"; 
+    }
+    return;
+}
+
+sub write_connection_config {
+    my ($isprimary,$domconf,$url,%connectssl);
+    my $primaryLibServer = &Apache::lonnet::domain($perlvar{'lonDefDomain'},'primary');
+    if ($primaryLibServer eq $perlvar{'lonHostID'}) {
+        $isprimary = 1;
+    } elsif ($primaryLibServer ne '') {
+        my $protocol = $Apache::lonnet::protocol{$primaryLibServer};
+        my $hostname = &Apache::lonnet::hostname($primaryLibServer);
+        unless ($protocol eq 'https') {
+            $protocol = 'http';
+        }
+        $url = $protocol.'://'.$hostname.'/cgi-bin/listdomconfig.pl';
+    }
+    my $domconf = &get_domain_config($perlvar{'lonDefDomain'},$primaryLibServer,$isprimary,
+                                     $url);
+    if (ref($domconf) eq 'HASH') {
+        if (ref($domconf->{'ssl'}) eq 'HASH') {
+            foreach my $connect ('connto','connfrom') {
+                if (ref($domconf->{'ssl'}->{$connect}) eq 'HASH') {
+                    my ($sslreq,$sslnoreq,$currsetting);
+                    my %contypes;
+                    foreach my $type ('dom','intdom','other') {
+                        $connectssl{$connect.'_'.$type} = $domconf->{'ssl'}->{$connect}->{$type};
+                    }
+                }
+            }
+        }
+        if (keys(%connectssl)) {
+            if (open(my $fh,">$perlvar{'lonTabDir'}/connectionrules.tab")) {
+                my $count = 0;
+                foreach my $key (sort(keys(%connectssl))) { 
+                    print $fh "$key=$connectssl{$key}\n";
+                    $count ++;
+                }
+                close($fh);
+                print "Completed writing SSL options for lonc/lond for $count items.\n";
+            }
+        } else {
+            print "Writing of SSL options skipped - no connection rules in domain configuration.\n";
+        }
+    } else {
+        print "Retrieval of SSL options for lonc/lond skipped - no configuration data available for domain.\n";
+    }
+}
+
+sub get_domain_config {
+    my ($dom,$primlibserv,$isprimary,$url) = @_;
+    my %confhash;
+    if ($isprimary) {
+        my $lonusersdir = $perlvar{'lonUsersDir'};
+        my $fname = $lonusersdir.'/'.$dom.'/configuration.db';
+        if (-e $fname) {
+            my $dbref=&LONCAPA::locking_hash_tie($fname,&GDBM_READER());
+            if (ref($dbref) eq 'HASH') {
+                foreach my $key (sort(keys(%{$dbref}))) {
+                    my $value = $dbref->{$key};
+                    if ($value =~ s/^__FROZEN__//) {
+                        $value = thaw(&LONCAPA::unescape($value));
+                    } else {
+                        $value = &LONCAPA::unescape($value);
+                    }
+                    $confhash{$key} = $value;
+                }
+                &LONCAPA::locking_hash_untie($dbref);
+            }
+        }
+    } else {
+        if (open(PIPE,"wget --no-check-certificate '$url?primary=$primlibserv&format=raw' |")) {
+            my $config = '';
+            while (<PIPE>) {
+                $config .= $_;
+            }
+            close(PIPE);
+            if ($config) {
+                my @pairs=split(/\&/,$config);
+                foreach my $item (@pairs) {
+                    my ($key,$value)=split(/=/,$item,2);
+                    my $what = &LONCAPA::unescape($key);
+                    if ($value =~ s/^__FROZEN__//) {
+                        $value = thaw(&LONCAPA::unescape($value));
+                    } else {
+                        $value = &LONCAPA::unescape($value);
+                    }
+                    $confhash{$what}=$value;
+                }
+            }
+        }
+    }
+    return \%confhash;
+}
+
+sub write_hosttypes {
+    my %intdom = &Apache::lonnet::all_host_intdom();
+    my %hostdom = &Apache::lonnet::all_host_domain();
+    my $dom = $hostdom{$perlvar{'lonHostID'}};
+    my $internetdom = $intdom{$perlvar{'lonHostID'}};
+    if (($dom ne '') && ($internetdom ne '')) {
+        if (keys(%hostdom)) {
+            if (open(my $fh,">$perlvar{'lonTabDir'}/hosttypes.tab")) {
+                my $count = 0;
+                foreach my $lonid (sort(keys(%hostdom))) {
+                    my $type = 'other';
+                    if ($hostdom{$lonid} eq $dom) {
+                        $type = 'dom'; 
+                    } elsif ($intdom{$lonid} eq $internetdom) {
+                        $type = 'intdom';
+                    }
+                    print $fh "$lonid:$type\n";
+                    $count ++;
+                }
+                close($fh);
+                print "Completed writing host type data for $count hosts.\n";
+            }
+        } else {
+            print "Writing of host types skipped - no hosts found.\n";
+        }
+    } else {
+        print "Writing of host types skipped - could not determine this host's LON-CAPA domain or 'internet' domain.\n";
+    }
+}
+
 sub send_mail {
-    print "sending mail\n";
-    my $emailto="$perlvar{'lonAdmEMail'}";
+    my $defdom = $perlvar{'lonDefDomain'};
+    my $origmail = $perlvar{'lonAdmEMail'};
+    my $emailto = &Apache::loncommon::build_recipient_list(undef,
+                                   'lonstatusmail',$defdom,$origmail);
     if ($totalcount>2500) {
 	$emailto.=",$perlvar{'lonSysEMail'}";
     }
-    my $subj="LON: $perlvar{'lonHostID'} E:$errors W:$warnings N:$notices"; 
-
-    my $result=system("metasend -b -S 4000000 -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");
+    my $from;
+    my $hostname=`/bin/hostname`;
+    chop($hostname);
+    $hostname=~s/[^\w\.]//g;
+    if ($hostname) {
+        $from = 'www@'.$hostname;
+    }
+    my $subj="LON: $perlvar{'lonHostID'} E:$errors W:$warnings N:$notices";
+    my $loncronmail = "To: $emailto\n".
+                      "From: $from\n".
+                      "Subject: ".$subj."\n".
+                      "Content-type: text/html\; charset=UTF-8\n".
+                      "MIME-Version: 1.0\n\n";
+    if (open(my $fh,"<$statusdir/index.html")) {
+        while (<$fh>) {
+            $loncronmail .= $_;
+        }
+        close($fh);
+    } else {
+        $loncronmail .= "Failed to read from http://$hostname/lon-status/index.html\n";
+    }
+    $loncronmail .= "\n\n";
+    if (open(my $mailh, "|/usr/lib/sendmail -oi -t -odb")) {
+        print $mailh $loncronmail;
+        close($mailh);
+        print "Sending mail.\n";
+    } else {
+        print "Sending mail failed.\n";
     }
 }
 
 sub usage {
     print(<<USAGE);
-loncron - housekeeping program that checks up on various parts of Lon-CAPA
+loncron - housekeeping program that checks up on various parts of LON-CAPA
 
 Options:
-   --help     Display help
-   --oldlonc  When starting the lonc daemon use 'lonc' not 'loncnew'
+   --help     Display 
    --noemail  Do not send the status email
    --justcheckconnections  Only check the current status of the lonc/d
                                 connections, do not send emails do not
@@ -614,10 +1002,9 @@ USAGE
 
 # ================================================================ Main Program
 sub main () {
-    my ($oldlonc,$help,$justcheckdaemons,$noemail,$justcheckconnections,
+    my ($help,$justcheckdaemons,$noemail,$justcheckconnections,
 	$justreload);
     &GetOptions("help"                 => \$help,
-		"oldlonc"              => \$oldlonc,
 		"justcheckdaemons"     => \$justcheckdaemons,
 		"noemail"              => \$noemail,
 		"justcheckconnections" => \$justcheckconnections,
@@ -630,7 +1017,7 @@ sub main () {
     undef $perlvarref;
     delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed
     delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed
-
+    chdir($perlvar{'lonDaemons'});
 # --------------------------------------- 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'}) {
@@ -648,40 +1035,53 @@ sub main () {
 # ----------------------------- 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");
+	print("User ID mismatch. This program must be run as user 'www'.\n");
 	my $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
 	my $subj="LON: $perlvar{'lonHostID'} User ID mismatch";
-	system("echo 'User ID mismatch.  loncron must be run as user www.' |\
+	system("echo 'User ID mismatch. loncron must be run as user www.' |\
  mailto $emailto -s '$subj' > /dev/null");
 	exit 1;
     }
 
-# ------------------------------------------------------------- Read hosts file
-    my $config=IO::File->new("$perlvar{'lonTabDir'}/hosts.tab");
-    
-    my (%hostname,%hostdom,%hostrole,%spareid);
-    while (my $configline=<$config>) {
-	next if ($configline =~ /^(\#|\s*\$)/);
-	my ($id,$domain,$role,$name)=split(/:/,$configline);
-	if ($id && $domain && $role && $name) {
-	    $name=~s/\s//g;
-	    $hostname{$id}=$name;
-	    $hostdom{$id}=$domain;
-	    $hostrole{$id}=$role;
-	}
-    }
-    undef $config;
-
-# ------------------------------------------------------ Read spare server file
-    $config=IO::File->new("$perlvar{'lonTabDir'}/spare.tab");
-    
-    while (my $configline=<$config>) {
-	chomp($configline);
-	if (($configline) && ($configline ne $perlvar{'lonHostID'})) {
-	    $spareid{$configline}=1;
-	}
+# -------------------------------------------- Force reload of host information
+    my $nomemcache;
+    if ($justcheckdaemons) {
+        $nomemcache=1;
+        my $memcachepidfile="$perlvar{'lonDaemons'}/logs/memcached.pid";
+        my $memcachepid;
+        if (-e $memcachepidfile) {
+            my $memfh=IO::File->new($memcachepidfile);
+            $memcachepid=<$memfh>;
+            chomp($memcachepid);
+            if ($memcachepid =~ /^\d+$/ && kill 0 => $memcachepid) {
+                undef($nomemcache);
+            }
+        }
+    }
+    &Apache::lonnet::load_hosts_tab(1,$nomemcache);
+    &Apache::lonnet::load_domain_tab(1,$nomemcache);
+    &Apache::lonnet::get_iphost(1,$nomemcache);
+
+# ----------------------------------------- Force firewall update for lond port  
+
+    if ((!$justcheckdaemons) && (!$justreload)) {
+        my $now = time;
+        my $tmpfile = $perlvar{'lonDaemons'}.'/tmp/lciptables_iphost_'.
+                      $now.$$.int(rand(10000));
+        if (open(my $fh,">$tmpfile")) {
+            my %iphosts = &Apache::lonnet::get_iphost();
+            foreach my $key (keys(%iphosts)) {
+                print $fh "$key\n";
+            }
+            close($fh);
+            if (&LONCAPA::try_to_lock('/tmp/lock_lciptables')) {
+                my $execpath = $perlvar{'lonDaemons'}.'/lciptables';
+                system("$execpath $tmpfile");
+                unlink('/tmp/lock_lciptables');  # Remove the lock file. 
+            }
+            unlink($tmpfile);
+        }
     }
-    undef $config;
 
 # ---------------------------------------------------------------- Start report
 
@@ -692,41 +1092,44 @@ sub main () {
 	
     my $fh;
     if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {
-	$fh=&start_logging(\%hostdom,\%hostrole,\%hostname,\%spareid);
+	$fh=&start_logging();
 
 	&log_machine_info($fh);
 	&clean_tmp($fh);
 	&clean_lonIDs($fh);
+        &clean_webDAV_sessionIDs($fh);
 	&check_httpd_logs($fh);
 	&rotate_lonnet_logs($fh);
+	&rotate_other_logs($fh);
     }
     if (!$justcheckconnections && !$justreload) {
+	&checkon_daemon($fh,'lonmemcached',40000);
 	&checkon_daemon($fh,'lonsql',200000);
 	if ( &checkon_daemon($fh,'lond',40000,'USR1') eq 'running') {
 	    &checkon_daemon($fh,'lond',40000,'USR2');
 	}
-	my $args='new';
-	if ($oldlonc) { $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);
+	&checkon_daemon($fh,'lonc',40000,'USR1');
+        &checkon_daemon($fh,'lonmaxima',40000);
+        &checkon_daemon($fh,'lonr',40000);
     }
     if ($justreload) {
+        &write_connection_config();
+        &write_hosttypes();
 	&checkon_daemon($fh,'lond',40000,'USR2');
-	my $args='new';
-	if ($oldlonc) { $args = ''; }
-	&checkon_daemon($fh,'lonc',40000,'USR2',$args);
+	&checkon_daemon($fh,'lonc',40000,'USR2');
     }
     if ($justcheckconnections) {
-	&test_connections($fh,\%hostname);
+	&test_connections($fh);
     }
     if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {
 	&check_delayed_msg($fh);
 	&finish_logging($fh);
 	&log_simplestatus();
-	
+        &write_loncaparevs();
+        &write_serverhomeIDs();
+	&write_checksums();
+        &write_connection_config();
+        &write_hosttypes();
 	if ($totalcount>200 && !$noemail) { &send_mail(); }
     }
 }
@@ -734,10 +1137,3 @@ sub main () {
 &main();
 1;
 
-
-
-
-
-
-
-