--- loncom/loncron 2008/11/04 21:06:21 1.77 +++ loncom/loncron 2009/04/22 09:41:21 1.80 @@ -2,7 +2,7 @@ # Housekeeping program, started by cron, loncontrol and loncron.pl # -# $Id: loncron,v 1.77 2008/11/04 21:06:21 www Exp $ +# $Id: loncron,v 1.80 2009/04/22 09:41:21 www 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; @@ -407,7 +408,7 @@ sub clean_sockets { opendir(SOCKETS,$perlvar{'lonSockDir'}); while (my $fname=readdir(SOCKETS)) { next if (-d $fname - || $fname=~/(mysqlsock|maximasock|\Q$perlvar{'lonSockDir'}\E)/); + || $fname=~/(mysqlsock|maximasock|rsock|\Q$perlvar{'lonSockDir'}\E)/); $cleaned++; &log($fh,"Unlinking $fname
"); unlink("/home/httpd/sockets/$fname"); @@ -587,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'}"; } @@ -696,6 +700,7 @@ sub main () { } &checkon_daemon($fh,'lonc',40000,'USR1'); &checkon_daemon($fh,'lonmaxima',40000); + &checkon_daemon($fh,'lonr',40000); } if ($justreload) { &checkon_daemon($fh,'lond',40000,'USR2');