loncom/loncron - diff

Return to loncron CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/loncron between versions 1.84 and 1.90

version 1.84, 2010/07/17 20:01:56	version 1.90, 2011/06/03 20:45:10
Line 32 use strict;	Line 32 use strict;

use lib '/home/httpd/lib/perl/';	use lib '/home/httpd/lib/perl/';
use LONCAPA::Configuration;	use LONCAPA::Configuration;
	use LONCAPA;
use Apache::lonnet;	use Apache::lonnet;
use Apache::loncommon;	use Apache::loncommon;

Line 686 sub log_simplestatus {	Line 687 sub log_simplestatus {
}	}

sub write_loncaparevs {	sub write_loncaparevs {
	print "Retrieving LON-CAPA version information\n";
if (open(my $fh,">$perlvar{'lonTabDir'}/loncaparevs.tab")) {	if (open(my $fh,">$perlvar{'lonTabDir'}/loncaparevs.tab")) {
my %hostname = &Apache::lonnet::all_hostnames();	my %hostname = &Apache::lonnet::all_hostnames();
foreach my $id (sort(keys(%hostname))) {	foreach my $id (sort(keys(%hostname))) {
if ($id ne '') {	if ($id ne '') {
my $loncaparev = &Apache::lonnet::get_server_loncaparev('',$id,1,'loncron');	my $loncaparev;
if ($loncaparev =~ /^[\d.\-]+$/) {	eval {
	local $SIG{ ALRM } = sub { die "TIMEOUT" };
	alarm(10);
	$loncaparev =
	&Apache::lonnet::get_server_loncaparev('',$id,1,'loncron');
	alarm(0);
	};
	if ($@ && $@ =~ m/TIMEOUT/) {
	print "time out while contacting lonHost: $id for version\n";
	}
	if ($loncaparev =~ /^[\w.\-]+$/) {
print $fh $id.':'.$loncaparev."\n";	print $fh $id.':'.$loncaparev."\n";
}	}
}	}
Line 701 sub write_loncaparevs {	Line 713 sub write_loncaparevs {
return;	return;
}	}

	sub write_serverhomeIDs {
	print "Retrieving LON-CAPA lonHostID information\n";
	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;
	eval {
	local $SIG{ ALRM } = sub { die "TIMEOUT" };
	alarm(10);
	$serverhomeID =
	&Apache::lonnet::get_server_homeID($name,1,'loncron');
	alarm(0);
	};
	if ($@ && $@ =~ m/TIMEOUT/) {
	print "Time out while contacting server: $name\n";
	}
	if ($serverhomeID ne '') {
	print $fh $name.':'.$serverhomeID."\n";
	} else {
	print $fh $name.':'.$name_to_host{$name}->[0]."\n";
	}
	}
	}
	}
	close($fh);
	}
	return;
	}

sub send_mail {	sub send_mail {
print "sending mail\n";	print "sending mail\n";
my $defdom = $perlvar{'lonDefDomain'};	my $defdom = $perlvar{'lonDefDomain'};
Line 801 sub main () {	Line 844 sub main () {
print $fh "$key\n";	print $fh "$key\n";
}	}
close($fh);	close($fh);
my $execpath = $perlvar{'lonDaemons'}.'/lciptables';	if (&LONCAPA::try_to_lock('/tmp/lock_lciptables')) {
system("$execpath $tmpfile");	my $execpath = $perlvar{'lonDaemons'}.'/lciptables';
unlink($fh);	system("$execpath $tmpfile");
	unlink('/tmp/lock_lciptables'); # Remove the lock file.
	}
	unlink($tmpfile);
}	}
}	}

Line 846 sub main () {	Line 892 sub main () {
&check_delayed_msg($fh);	&check_delayed_msg($fh);
&finish_logging($fh);	&finish_logging($fh);
&log_simplestatus();	&log_simplestatus();
	&write_loncaparevs();
	&write_serverhomeIDs();

if ($totalcount>200 && !$noemail) { &send_mail(); }	if ($totalcount>200 && !$noemail) { &send_mail(); }
}	}
if (!$justcheckconnections && !$justreload) {
&write_loncaparevs();
}
}	}

&main();	&main();

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.84
changed lines
	Added in v.1.90