--- loncom/loncron 2013/02/02 14:42:01 1.97 +++ loncom/loncron 2014/03/17 14:47:38 1.100 @@ -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.100 2014/03/17 14:47:38 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -271,7 +271,7 @@ sub log_machine_info { &log($fh,"

distprobe

"); &log($fh,"
");
-    &get_distro($perlvar{'lonDaemons'},$fh);
+    &log($fh,&encode_entities(&LONCAPA::distro(),'<>&"'));
     &log($fh,"
"); &errout($fh); @@ -526,7 +526,7 @@ sub check_httpd_logs { sub rotate_lonnet_logs { my ($fh)=@_; &log($fh,'

lonnet

Temp Log

');
-    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=) { 
@@ -570,7 +570,7 @@ sub rotate_other_logs {
 sub test_connections {
     my ($fh)=@_;
     &log($fh,'
Connections
');
-    print "testing connections\n";
+    print "Testing connections.\n";
     &log($fh,"");
     my ($good,$bad)=(0,0);
     my %hostname = &Apache::lonnet::all_hostnames();
@@ -604,7 +604,7 @@ sub test_connections {
 sub check_delayed_msg {
     my ($fh)=@_;
     &log($fh,'
Delayed Messages
');
-    print "checking buffers\n";
+    print "Checking buffers.\n";
     
     &log($fh,'
Scanning Permanent Log
');
 
@@ -654,7 +654,7 @@ sub check_delayed_msg {
             };
             if ($@ && $@ =~ m/TIMEOUT/) {
                 &log($fh,"Attempted pong to $tryserver timed out
");
-                print "time out while contacting: $tryserver for pong\n";
+                print "Time out while contacting: $tryserver for pong.\n";
             } else {
                 &log($fh,"Pong to $tryserver: $answer
");
             }
@@ -673,7 +673,7 @@ sub finish_logging {
     my $now=time;
     my $date=localtime($now);
     &log($fh,"
$date ($now)\n");
-    print "lon-status webpage updated\n";
+    print "lon-status webpage updated.\n";
     $fh->close();
 
     if ($errors) { $simplestatus{'errors'}=$errors; }
@@ -694,65 +694,75 @@ 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;
+    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);
-                    $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;
@@ -772,7 +782,7 @@ sub write_checksums {
 }
 
 sub send_mail {
-    print "sending mail\n";
+    print "Sending mail.\n";
     my $defdom = $perlvar{'lonDefDomain'};
     my $origmail = $perlvar{'lonAdmEMail'};
     my $emailto = &Apache::loncommon::build_recipient_list(undef,
@@ -788,24 +798,9 @@ 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(< /dev/null");
 	exit 1;
     }