--- loncom/loncron	2010/07/17 20:01:56	1.84
+++ loncom/loncron	2011/04/23 16:18:49	1.88
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.84 2010/07/17 20:01:56 raeburn Exp $
+# $Id: loncron,v 1.88 2011/04/23 16:18:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -691,7 +691,7 @@ sub write_loncaparevs {
         foreach my $id (sort(keys(%hostname))) {
             if ($id ne '') {
                 my $loncaparev = &Apache::lonnet::get_server_loncaparev('',$id,1,'loncron');
-                if ($loncaparev =~ /^[\d.\-]+$/) {
+                if ($loncaparev =~ /^[\w.\-]+$/) {
                     print $fh $id.':'.$loncaparev."\n";
                 }
             }
@@ -701,6 +701,26 @@ sub write_loncaparevs {
     return;
 }
 
+sub write_serverhomeIDs {
+    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 = &Apache::lonnet::get_server_homeID($name,1,'loncron');
+                    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'};
@@ -803,7 +823,7 @@ sub main () {
             close($fh);
             my $execpath = $perlvar{'lonDaemons'}.'/lciptables';
             system("$execpath $tmpfile");
-            unlink($fh);
+            unlink($tmpfile);
         }
     }
 
@@ -846,12 +866,11 @@ sub main () {
 	&check_delayed_msg($fh);
 	&finish_logging($fh);
 	&log_simplestatus();
+        &write_loncaparevs();
+        &write_serverhomeIDs();
 	
 	if ($totalcount>200 && !$noemail) { &send_mail(); }
     }
-    if (!$justcheckconnections && !$justreload) {
-        &write_loncaparevs();
-    }
 }
 
 &main();