--- loncom/loncron	2007/04/13 18:26:22	1.73
+++ loncom/loncron	2009/06/11 00:15:27	1.81
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.73 2007/04/13 18:26:22 albertel Exp $
+# $Id: loncron,v 1.81 2009/06/11 00:15:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use strict;
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
 use Apache::lonnet;
+use Apache::loncommon;
 
 use IO::File;
 use IO::Socket;
@@ -81,7 +82,9 @@ sub start_daemon {
     }
     my $error_fname="$perlvar{'lonDaemons'}/logs/${daemon}_errors";
     &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;
     if (-e $pidfile) {
@@ -302,7 +305,6 @@ sub start_logging {
 <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>
@@ -399,6 +401,21 @@ sub clean_lonIDs {
     &log($fh,"<h3>$active open 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 {
@@ -571,7 +588,10 @@ sub log_simplestatus {
 
 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'}";
     }
@@ -623,7 +643,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'}) {
@@ -654,6 +674,24 @@ sub main () {
     &Apache::lonnet::load_domain_tab(1);
     &Apache::lonnet::get_iphost(1);
 
+# ----------------------------------------- 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);
+            my $execpath = $perlvar{'lonDaemons'}.'/lciptables';
+            system("$execpath $tmpfile");
+            unlink($fh);
+        }
+    }
+
 # ---------------------------------------------------------------- Start report
 
     $errors=0;
@@ -673,14 +711,14 @@ sub main () {
 	&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');
 	}
 	&checkon_daemon($fh,'lonc',40000,'USR1');
-	&checkon_daemon($fh,'lonhttpd',40000);
-	&checkon_daemon($fh,'lonmemcached',40000);
         &checkon_daemon($fh,'lonmaxima',40000);
+        &checkon_daemon($fh,'lonr',40000);
     }
     if ($justreload) {
 	&checkon_daemon($fh,'lond',40000,'USR2');