--- loncom/loncron 2007/04/13 18:26:22 1.73 +++ loncom/loncron 2010/08/21 22:23:05 1.87 @@ -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.87 2010/08/21 22:23:05 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 {
Cleaned up ".$cleaned." stale sockets.
"); +} + # ----------------------------------------------------------------------- httpd sub check_httpd_logs { @@ -453,12 +564,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 @@ -569,9 +685,48 @@ sub log_simplestatus { $sfh->close(); } +sub write_loncaparevs { + 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 = &Apache::lonnet::get_server_loncaparev('',$id,1,'loncron'); + if ($loncaparev =~ /^[\w.\-]+$/) { + print $fh $id.':'.$loncaparev."\n"; + } + } + } + close($fh); + } + 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 $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 +778,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 +809,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 +846,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'); @@ -693,6 +866,8 @@ sub main () { &check_delayed_msg($fh); &finish_logging($fh); &log_simplestatus(); + &write_loncaparevs(); + &write_serverhomeIDs(); if ($totalcount>200 && !$noemail) { &send_mail(); } }