--- loncom/loncron	2013/02/02 14:42:01	1.97
+++ loncom/loncron	2013/05/29 18:10:54	1.99
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.97 2013/02/02 14:42:01 raeburn Exp $
+# $Id: loncron,v 1.99 2013/05/29 18:10:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -271,7 +271,7 @@ sub log_machine_info {
 
     &log($fh,"<h3>distprobe</h3>");
     &log($fh,"<pre>");
-    &get_distro($perlvar{'lonDaemons'},$fh);
+    &log($fh,&encode_entities(&LONCAPA::distro(),'<>&"'));
     &log($fh,"</pre>");
 
     &errout($fh);
@@ -695,64 +695,74 @@ sub log_simplestatus {
 
 sub write_loncaparevs {
     print "Retrieving LON-CAPA version information\n";
-    if (open(my $fh,">$perlvar{'lonTabDir'}/loncaparevs.tab")) {
-        my %hostname = &Apache::lonnet::all_hostnames();
-        foreach my $id (sort(keys(%hostname))) {
-            if ($id ne '') {
-                my $loncaparev;
+    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);
-                    $loncaparev =
-                        &Apache::lonnet::get_server_loncaparev('',$id,1,'loncron');
+                    $serverhomeID = 
+                        &Apache::lonnet::get_server_homeID($name,1,'loncron');
                     alarm(0);
                 };
                 if ($@ && $@ =~ m/TIMEOUT/) {
-                    print "time out while contacting lonHost: $id for version\n";   
+                    print "Time out while contacting server: $name\n"; 
                 }
-                if ($loncaparev =~ /^[\w.\-]+$/) {
-                    print $fh $id.':'.$loncaparev."\n";
+                if ($serverhomeID ne '') {
+                    $output .= $name.':'.$serverhomeID."\n";
+                } else {
+                    $output .= $name.':'.$name_to_host{$name}->[0]."\n";
                 }
             }
         }
-        close($fh);
     }
-    return;
-}
-
-sub write_serverhomeIDs {
-    print "Retrieving LON-CAPA lonHostID information\n";
-    if (open(my $fh,">$perlvar{'lonTabDir'}/serverhomeIDs.tab")) {
-        my %name_to_host = &Apache::lonnet::all_names();
-        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 '') {
-                        print $fh $name.':'.$serverhomeID."\n";
-                    } else {
-                        print $fh $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();
         }
-        close($fh);
     }
     return;
 }
 
 sub write_checksums {
-    my $distro = &get_distro($perlvar{'lonDaemons'});
+    my $distro = &LONCAPA::distro();
     if ($distro) {
         print "Retrieving file version and checksumming.\n";
         my $numchksums = 0;
@@ -788,21 +798,6 @@ sub send_mail {
     }
 }
 
-sub get_distro {
-    my ($dir,$fh) = @_;
-    my $distro;
-    if (open(my $disth,"$dir/distprobe |")) {
-        while (my $line=<$disth>) {
-            if ($fh) {
-                &log($fh,&encode_entities($line,'<>&"'));
-            }
-            $distro .= $line;
-        }
-        close($disth);
-    }
-    return $distro;
-}
-
 sub usage {
     print(<<USAGE);
 loncron - housekeeping program that checks up on various parts of Lon-CAPA