Rotating $description ...
"); + rename("$file.2","$file.3"); + rename("$file.1","$file.2"); + rename("$file","$file.1"); + } +} + sub start_daemon { - my ($fh,$daemon,$pidfile) = @_; + my ($fh,$daemon,$pidfile,$args) = @_; my $progname=$daemon; - if ($daemon eq 'lonc' && $ARGV[0] eq 'new') { + if ($daemon eq 'lonc') { $progname='loncnew'; - print "new "; } - system("$perlvar{'lonDaemons'}/$progname 2>>$perlvar{'lonDaemons'}/logs/${daemon}_errors"); - sleep 2; + 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) { &log($fh,"Seems like it started ...
"); my $lfh=IO::File->new("$pidfile"); my $daemonpid=<$lfh>; chomp($daemonpid); - sleep 2; - if (kill 0 => $daemonpid) { + if ($daemonpid =~ /^\d+$/ && kill 0 => $daemonpid) { return 1; } else { return 0; @@ -103,10 +103,11 @@ sub start_daemon { } sub checkon_daemon { - my ($fh,$daemon,$maxsize,$sendusr1)=@_; + my ($fh,$daemon,$maxsize,$send,$args)=@_; + my $result; &log($fh,'');
- printf("%-10s ",$daemon);
+ printf("%-15s ",$daemon);
if (-e "$perlvar{'lonDaemons'}/logs/$daemon.log"){
open (DFH,"tail -n25 $perlvar{'lonDaemons'}/logs/$daemon.log|");
while (my $line= Give it one more try ... Rotating logs ... Cleaned up ".$cleaned." stale sockets. Rotating logs ...$daemon at pid $daemonpid responding");
- if ($sendusr1) { &log($fh,", sending USR1"); }
+ if ($send) { &log($fh,", sending $send"); }
&log($fh,"
");
- if ($sendusr1) { kill USR1 => $daemonpid; }
+ if ($send eq 'USR1') { kill USR1 => $daemonpid; }
+ if ($send eq 'USR2') { kill USR2 => $daemonpid; }
$restartflag=0;
- print "running\n";
+ if ($send eq 'USR2') {
+ $result = 'reloaded';
+ print "reloaded\n";
+ } else {
+ $result = 'running';
+ print "running\n";
+ }
} else {
$errors++;
&log($fh,"$daemon at pid $daemonpid not responding
");
@@ -144,28 +152,33 @@ sub checkon_daemon {
if ($restartflag==1) {
$simplestatus{$daemon}='off';
$errors++;
+ my $kadaemon=$daemon;
+ if ($kadaemon eq 'lonmemcached') { $kadaemon='memcached'; }
&log($fh,'
Killall '.$daemon.': '.
- `killall $daemon 2>&1`.' - ');
- sleep 2;
+ `killall $kadaemon 2>&1`.' - ');
+ sleep 1;
&log($fh,unlink($pidfile).' - '.
- `killall -9 $daemon 2>&1`.
+ `killall -9 $kadaemon 2>&1`.
'
');
&log($fh,"$daemon not running, trying to start
");
- if (&start_daemon($fh,$daemon,$pidfile)) {
+ if (&start_daemon($fh,$daemon,$pidfile,$args)) {
&log($fh,"$daemon at pid $daemonpid responding
");
$simplestatus{$daemon}='restarted';
+ $result = 'started';
print "started\n";
} else {
$errors++;
&log($fh,"$daemon at pid $daemonpid not responding
");
&log($fh,"$daemon at pid $daemonpid responding
");
$simplestatus{$daemon}='restarted';
+ $result = 'started';
print "started\n";
} else {
+ $result = 'failed';
print " failed\n";
$simplestatus{$daemon}='failed';
$errors++; $errors++;
@@ -188,20 +201,10 @@ sub checkon_daemon {
}
my $fname="$perlvar{'lonDaemons'}/logs/$daemon.log";
-
- my ($dev,$ino,$mode,$nlink,
- $uid,$gid,$rdev,$size,
- $atime,$mtime,$ctime,
- $blksize,$blocks)=stat($fname);
-
- if ($size>$maxsize) {
- &log($fh,"");
my $psproc=0;
- open (PSH,"ps -aux --cols 140 |");
+ open (PSH,"ps aux --cols 140 |");
while (my $line=");
&errout($fh);
}
+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');
+}
+
# ----------------------------------------------------------------- Connections
sub test_connections {
- my ($fh,$hostname)=@_;
+ my ($fh)=@_;
&log($fh,'distprobe
");
+ &log($fh,"");
+ open(DSH,"$perlvar{'lonDaemons'}/distprobe |");
+ while (my $line=");
+
&errout($fh);
}
sub start_logging {
- my ($hostdom,$hostrole,$hostname,$spareid)=@_;
my $fh=IO::File->new(">$statusdir/newstatus.html");
my %simplestatus=();
my $now=time;
@@ -310,17 +322,24 @@ ENDHEADERS
&encode_entities($perlvar{$varname},'<>&"')."\n");
}
&log($fh,"Hosts
");
- foreach my $id (sort(keys(%{$hostname}))) {
+ my %hostname = &Apache::lonnet::all_hostnames();
+ foreach my $id (sort(keys(%hostname))) {
+ my $role = (&Apache::lonnet::is_library($id) ? 'library'
+ : 'access');
&log($fh,
- "
$id ".$hostdom->{$id}.
- " ".$hostrole->{$id}.
- " ".$hostname->{$id}." Spare Hosts
");
- foreach my $id (sort(keys(%{$spareid}))) {
- &log($fh,"
\n");
+ &log($fh,"\n");
return $fh;
}
@@ -382,6 +401,21 @@ sub clean_lonIDs {
&log($fh,"$id ".&Apache::lonnet::host_domain($id).
+ " ".$role.
+ " ".&Apache::lonnet::hostname($id)." Spare Hosts
");
+ foreach my $type (sort(keys(%Apache::lonnet::spareid))) {
+ &log($fh,"
");
+ foreach my $id (@{ $Apache::lonnet::spareid{$type} }) {
+ &log($fh,"
\n$active open session(s)
");
}
+# ----------------------------------------------------------- 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|\Q$perlvar{'lonSockDir'}\E)/);
+ $cleaned++;
+ &log($fh,"Unlinking $fname
");
+ unlink("/home/httpd/sockets/$fname");
+ }
+ &log($fh,"Connections
');
print "testing connections\n";
&log($fh,"");
my ($good,$bad)=(0,0);
- foreach my $tryserver (sort(keys(%{$hostname}))) {
+ my %hostname = &Apache::lonnet::all_hostnames();
+ foreach my $tryserver (sort(keys(%hostname))) {
print(".");
my $result;
- my $answer=reply("pong",$tryserver);
+ my $answer=&Apache::lonnet::reply("ping",$tryserver);
if ($answer eq "$tryserver:$perlvar{'lonHostID'}") {
$result="ok";
$good++;
@@ -465,6 +499,8 @@ sub test_connections {
if ($answer eq 'con_lost') {
$bad++;
$warnings++;
+ } else {
+ $good++; #self connection
}
}
if ($answer =~ /con_lost/) { print(" $tryserver down\n"); }
@@ -503,13 +539,22 @@ sub check_delayed_msg {
if ($unsend) { $simplestatus{'unsend'}=$unsend; }
&log($fh,"
Outgoing Buffer
\n");
-
+# list directory with delayed messages and remember offline servers
+ my %servers=();
open (DFH,"ls -lF $perlvar{'lonSockDir'}/delayed|");
- while (my $line=\n");
close (DFH);
+# pong to all servers that have delayed messages
+# this will trigger a reverse connection, which should flush the buffers
+ foreach my $tryserver (keys %servers) {
+ my $answer=&Apache::lonnet::reply("pong",$tryserver);
+ &log($fh,"Pong to $tryserver: $answer
");
+ }
}
sub finish_logging {
@@ -531,7 +576,7 @@ sub finish_logging {
}
sub log_simplestatus {
- rename ("$statusdir/newstatus.html","$statusdir/index.html");
+ rename("$statusdir/newstatus.html","$statusdir/index.html");
my $sfh=IO::File->new(">$statusdir/loncron_simple.txt");
foreach (keys %simplestatus) {
@@ -544,11 +589,15 @@ sub log_simplestatus {
sub send_mail {
print "sending mail\n";
my $emailto="$perlvar{'lonAdmEMail'}";
- if ($totalcount>1000) {
+ if ($totalcount>2500) {
$emailto.=",$perlvar{'lonSysEMail'}";
}
my $subj="LON: $perlvar{'lonHostID'} E:$errors W:$warnings N:$notices";
- system("metasend -b -t $emailto -s '$subj' -f $statusdir/index.html -m text/html");
+
+ my $result=system("metasend -b -S 4000000 -t $emailto -s '$subj' -f $statusdir/index.html -m text/html >& /dev/null");
+ if ($result != 0) {
+ $result=system("mail -s '$subj' $emailto < $statusdir/index.html");
+ }
}
sub usage {
@@ -556,8 +605,7 @@ sub usage {
loncron - housekeeping program that checks up on various parts of Lon-CAPA
Options:
- --help Display help
- --oldlonc When starting the lonc daemon use 'lonc' not 'loncnew'
+ --help Display
--noemail Do not send the status email
--justcheckconnections Only check the current status of the lonc/d
connections, do not send emails do not
@@ -567,18 +615,23 @@ Options:
running, do not send emails do not
check the lonc/d connections, do not
generate lon-status
+ --justreload Only tell the daemons to reload the config files,
+ do not send emails do not
+ check if the daemons are running, do not
+ generate lon-status
USAGE
}
# ================================================================ Main Program
sub main () {
- my ($oldlonc,$help,$justcheckdaemons,$noemail,$justcheckconnections);
+ my ($help,$justcheckdaemons,$noemail,$justcheckconnections,
+ $justreload);
&GetOptions("help" => \$help,
- "oldlonc" => \$oldlonc,
"justcheckdaemons" => \$justcheckdaemons,
"noemail" => \$noemail,
- "justcheckconnections" => \$justcheckconnections
+ "justcheckconnections" => \$justcheckconnections,
+ "justreload" => \$justreload
);
if ($help) { &usage(); return; }
# --------------------------------- Read loncapa_apache.conf and loncapa.conf
@@ -613,31 +666,10 @@ sub main () {
exit 1;
}
-# ------------------------------------------------------------- Read hosts file
- my $config=IO::File->new("$perlvar{'lonTabDir'}/hosts.tab");
-
- my (%hostname,%hostdom,%hostrole,%spareid);
- while (my $configline=<$config>) {
- next if ($configline =~ /^(\#|\s*\$)/);
- my ($id,$domain,$role,$name,$ip,$domdescr)=split(/:/,$configline);
- if ($id && $domain && $role && $name && $ip) {
- $hostname{$id}=$name;
- $hostdom{$id}=$domain;
- $hostrole{$id}=$role;
- }
- }
- undef $config;
-
-# ------------------------------------------------------ Read spare server file
- $config=IO::File->new("$perlvar{'lonTabDir'}/spare.tab");
-
- while (my $configline=<$config>) {
- chomp($configline);
- if (($configline) && ($configline ne $perlvar{'lonHostID'})) {
- $spareid{$configline}=1;
- }
- }
- undef $config;
+# -------------------------------------------- Force reload of host information
+ &Apache::lonnet::load_hosts_tab(1);
+ &Apache::lonnet::load_domain_tab(1);
+ &Apache::lonnet::get_iphost(1);
# ---------------------------------------------------------------- Start report
@@ -647,25 +679,34 @@ sub main () {
my $fh;
- if (!$justcheckdaemons && !$justcheckconnections) {
- $fh=&start_logging(\%hostdom,\%hostrole,\%hostname,\%spareid);
+ if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {
+ $fh=&start_logging();
&log_machine_info($fh);
&clean_tmp($fh);
&clean_lonIDs($fh);
&check_httpd_logs($fh);
&rotate_lonnet_logs($fh);
+ &rotate_other_logs($fh);
}
- if (!$justcheckconnections) {
+ if (!$justcheckconnections && !$justreload) {
&checkon_daemon($fh,'lonsql',200000);
- &checkon_daemon($fh,'lond',40000,1);
- &checkon_daemon($fh,'lonc',40000,1);
+ 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);
+ }
+ if ($justreload) {
+ &checkon_daemon($fh,'lond',40000,'USR2');
+ &checkon_daemon($fh,'lonc',40000,'USR2');
}
- if (!$justcheckdaemons) {
- &test_connections($fh,\%hostname);
+ if ($justcheckconnections) {
+ &test_connections($fh);
}
- if (!$justcheckdaemons && !$justcheckconnections) {
+ if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {
&check_delayed_msg($fh);
&finish_logging($fh);
&log_simplestatus();