--- loncom/loncron	2009/11/26 00:18:09	1.82
+++ loncom/loncron	2011/06/03 20:45:10	1.90
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.82 2009/11/26 00:18:09 raeburn Exp $
+# $Id: loncron,v 1.90 2011/06/03 20:45:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,6 +32,7 @@ use strict;
 
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
+use LONCAPA;
 use Apache::lonnet;
 use Apache::loncommon;
 
@@ -564,12 +565,17 @@ sub rotate_lonnet_logs {
 
 sub rotate_other_logs {
     my ($fh) = @_;
-    my $fname="$perlvar{'lonDaemons'}/logs/autoenroll.log";
-    &rotate_logfile($fname,$fh,'Auto Enroll log');
-    $fname="$perlvar{'lonDaemons'}/logs/autocreate.log";
-    &rotate_logfile($fname,$fh,'Create Course log');
-    $fname="$perlvar{'lonDaemons'}/logs/searchcat.log";
-    &rotate_logfile($fname,$fh,'Search Cataloguing log');
+    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
@@ -680,6 +686,64 @@ sub log_simplestatus {
     $sfh->close();
 }
 
+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;
+                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.\-]+$/) {
+                    print $fh $id.':'.$loncaparev."\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";
+                    }
+                }
+            }
+        }
+        close($fh);
+    }
+    return;
+}
+
 sub send_mail {
     print "sending mail\n";
     my $defdom = $perlvar{'lonDefDomain'};
@@ -780,9 +844,12 @@ sub main () {
                 print $fh "$key\n";
             }
             close($fh);
-            my $execpath = $perlvar{'lonDaemons'}.'/lciptables';
-            system("$execpath $tmpfile");
-            unlink($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);
         }
     }
 
@@ -825,6 +892,8 @@ sub main () {
 	&check_delayed_msg($fh);
 	&finish_logging($fh);
 	&log_simplestatus();
+        &write_loncaparevs();
+        &write_serverhomeIDs();
 	
 	if ($totalcount>200 && !$noemail) { &send_mail(); }
     }