loncom/loncron - diff

Return to loncron CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/loncron between versions 1.62 and 1.63

version 1.62, 2005/11/10 19:07:01	version 1.63, 2006/01/27 21:27:15
Line 112 sub start_daemon {	Line 112 sub start_daemon {
sub checkon_daemon {	sub checkon_daemon {
my ($fh,$daemon,$maxsize,$send,$args)=@_;	my ($fh,$daemon,$maxsize,$send,$args)=@_;

	my $result;
&log($fh,'<hr /><a name="'.$daemon.'" /><h2>'.$daemon.'</h2><h3>Log</h3><p style="white-space: pre;"><tt>');	&log($fh,'<hr /><a name="'.$daemon.'" /><h2>'.$daemon.'</h2><h3>Log</h3><p style="white-space: pre;"><tt>');
printf("%-15s ",$daemon);	printf("%-15s ",$daemon);
if (-e "$perlvar{'lonDaemons'}/logs/$daemon.log"){	if (-e "$perlvar{'lonDaemons'}/logs/$daemon.log"){
Line 142 sub checkon_daemon {	Line 143 sub checkon_daemon {
if ($send eq 'USR2') { kill USR2 => $daemonpid; }	if ($send eq 'USR2') { kill USR2 => $daemonpid; }
$restartflag=0;	$restartflag=0;
if ($send eq 'USR2') {	if ($send eq 'USR2') {
	$result = 'reloaded';
print "reloaded\n";	print "reloaded\n";
} else {	} else {
	$result = 'running';
print "running\n";	print "running\n";
}	}
} else {	} else {
Line 169 sub checkon_daemon {	Line 172 sub checkon_daemon {
if (&start_daemon($fh,$daemon,$pidfile,$args)) {	if (&start_daemon($fh,$daemon,$pidfile,$args)) {
&log($fh,"<h3>$daemon at pid $daemonpid responding</h3>");	&log($fh,"<h3>$daemon at pid $daemonpid responding</h3>");
$simplestatus{$daemon}='restarted';	$simplestatus{$daemon}='restarted';
	$result = 'started';
print "started\n";	print "started\n";
} else {	} else {
$errors++;	$errors++;
Line 178 sub checkon_daemon {	Line 182 sub checkon_daemon {
if (&start_daemon($fh,$daemon,$pidfile,$args)) {	if (&start_daemon($fh,$daemon,$pidfile,$args)) {
&log($fh,"<h3>$daemon at pid $daemonpid responding</h3>");	&log($fh,"<h3>$daemon at pid $daemonpid responding</h3>");
$simplestatus{$daemon}='restarted';	$simplestatus{$daemon}='restarted';
	$result = 'started';
print "started\n";	print "started\n";
} else {	} else {
	$result = 'failed';
print " failed\n";	print " failed\n";
$simplestatus{$daemon}='failed';	$simplestatus{$daemon}='failed';
$errors++; $errors++;	$errors++; $errors++;
Line 216 sub checkon_daemon {	Line 222 sub checkon_daemon {
}	}

&errout($fh);	&errout($fh);
	return $result;
}	}

# --------------------------------------------------------------------- Machine	# --------------------------------------------------------------------- Machine
Line 695 sub main () {	Line 702 sub main () {
}	}
if (!$justcheckconnections && !$justreload) {	if (!$justcheckconnections && !$justreload) {
&checkon_daemon($fh,'lonsql',200000);	&checkon_daemon($fh,'lonsql',200000);
&checkon_daemon($fh,'lond',40000,'USR1');	if ( &checkon_daemon($fh,'lond',40000,'USR1') eq 'running') {
	&checkon_daemon($fh,'lond',40000,'USR2');
	}
my $args='new';	my $args='new';
if ($oldlonc) { $args = ''; }	if ($oldlonc) { $args = ''; }
&checkon_daemon($fh,'lonc',40000,'USR1',$args);	if ( &checkon_daemon($fh,'lonc',40000,'USR1',$args) eq 'running') {
	&checkon_daemon($fh,'lond',40000,'USR2',$args);
	}
&checkon_daemon($fh,'lonhttpd',40000);	&checkon_daemon($fh,'lonhttpd',40000);
&checkon_daemon($fh,'lonmemcached',40000);	&checkon_daemon($fh,'lonmemcached',40000);
}	}
Line 708 sub main () {	Line 719 sub main () {
if ($oldlonc) { $args = ''; }	if ($oldlonc) { $args = ''; }
&checkon_daemon($fh,'lonc',40000,'USR2',$args);	&checkon_daemon($fh,'lonc',40000,'USR2',$args);
}	}
if (!$justcheckdaemons && !$justreload) {	if ($justcheckconnections) {
&test_connections($fh,\%hostname);	&test_connections($fh,\%hostname);
}	}
if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {	if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {

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

Removed from v.1.62
changed lines
	Added in v.1.63