loncom/loncnew - diff

Return to loncnew CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/loncnew between versions 1.39 and 1.52

version 1.39, 2004/01/13 09:57:18	version 1.52, 2004/08/30 11:01:04
Line 63 use LONCAPA::Configuration;	Line 63 use LONCAPA::Configuration;
use LONCAPA::HashIterator;	use LONCAPA::HashIterator;


#
# Disable all signals we might receive from outside for now.
#


# Read the httpd configuration file to get perl variables	# Read the httpd configuration file to get perl variables
# normally set in apache modules:	# normally set in apache modules:

Line 87 my $ClientConnection = 0; # Uniquifier f	Line 82 my $ClientConnection = 0; # Uniquifier f

my $DebugLevel = 0;	my $DebugLevel = 0;
my $NextDebugLevel= 2; # So Sigint can toggle this.	my $NextDebugLevel= 2; # So Sigint can toggle this.
my $IdleTimeout= 3600; # Wait an hour before pruning connections.	my $IdleTimeout= 600; # Wait 10 minutes before pruning connections.

my $LogTransactions = 0; # When True, all transactions/replies get logged.	my $LogTransactions = 0; # When True, all transactions/replies get logged.

Line 107 my $Status = ""; # Current stat	Line 102 my $Status = ""; # Current stat
my $RecentLogEntry = "";	my $RecentLogEntry = "";
my $ConnectionRetries=2; # Number of connection retries allowed.	my $ConnectionRetries=2; # Number of connection retries allowed.
my $ConnectionRetriesLeft=2; # Number of connection retries remaining.	my $ConnectionRetriesLeft=2; # Number of connection retries remaining.
	my $LondVersion = "unknown"; # Version of lond we talk with.
	my $KeyMode = ""; # e.g. ssl, local, insecure from last connect.

#	#
# The hash below gives the HTML format for log messages	# The hash below gives the HTML format for log messages
Line 114 my $ConnectionRetriesLeft=2; # Number of	Line 111 my $ConnectionRetriesLeft=2; # Number of
#	#
my %LogFormats;	my %LogFormats;

$LogFormats{"CRITICAL"} = "<font color=red>CRITICAL: %s</font>";	$LogFormats{"CRITICAL"} = "<font color='red'>CRITICAL: %s</font>";
$LogFormats{"SUCCESS"} = "<font color=green>SUCCESS: %s</font>";	$LogFormats{"SUCCESS"} = "<font color='green'>SUCCESS: %s</font>";
$LogFormats{"INFO"} = "<font color=yellow>INFO: %s</font>";	$LogFormats{"INFO"} = "<font color='yellow'>INFO: %s</font>";
$LogFormats{"WARNING"} = "<font color=blue>WARNING: %s</font>";	$LogFormats{"WARNING"} = "<font color='blue'>WARNING: %s</font>";
$LogFormats{"DEFAULT"} = " %s ";	$LogFormats{"DEFAULT"} = " %s ";


Line 160 host and the time will be formatted into	Line 157 host and the time will be formatted into
=cut	=cut

sub Log {	sub Log {
my $severity = shift;
my $message = shift;	my ($severity, $message) = @_;

if(!$LogFormats{$severity}) {	if(!$LogFormats{$severity}) {
$severity = "DEFAULT";	$severity = "DEFAULT";
}	}
Line 197 Returns the name of the host that a sock	Line 194 Returns the name of the host that a sock
=cut	=cut

sub GetPeername {	sub GetPeername {
my $connection = shift;
my $AdrFamily = shift;
	my ($connection, $AdrFamily) = @_;

my $peer = $connection->peername();	my $peer = $connection->peername();
my $peerport;	my $peerport;
my $peerip;	my $peerip;
Line 221 Invoked to issue a debug message.	Line 220 Invoked to issue a debug message.
=cut	=cut

sub Debug {	sub Debug {
my $level = shift;
my $message = shift;	my ($level, $message) = @_;

if ($level <= $DebugLevel) {	if ($level <= $DebugLevel) {
Log("INFO", "-Debug- $message host = $RemoteHost");	Log("INFO", "-Debug- $message host = $RemoteHost");
}	}
}	}

sub SocketDump {	sub SocketDump {
my $level = shift;
my $socket= shift;	my ($level, $socket) = @_;

if($level <= $DebugLevel) {	if($level <= $DebugLevel) {
$socket->Dump();	$socket->Dump(-1); # Ensure it will get dumped.
}	}
}	}

Line 264 sub ShowStatus {	Line 265 sub ShowStatus {
sub SocketTimeout {	sub SocketTimeout {
my $Socket = shift;	my $Socket = shift;
Log("WARNING", "A socket timeout was detected");	Log("WARNING", "A socket timeout was detected");
Debug(0, " SocketTimeout called: ");	Debug(5, " SocketTimeout called: ");
$Socket->Dump();	$Socket->Dump(0);
	if(exists($ActiveTransactions{$Socket})) {
	FailTransaction($ActiveTransactions{$Socket});
	}
KillSocket($Socket); # A transaction timeout also counts as	KillSocket($Socket); # A transaction timeout also counts as
# a connection failure:	# a connection failure:
$ConnectionRetriesLeft--;	$ConnectionRetriesLeft--;
	if($ConnectionRetriesLeft <= 0) {
	Log("CRITICAL", "Host marked DEAD: ".GetServerHost());
	}

}	}
#----------------------------- Timer management ------------------------	#----------------------------- Timer management ------------------------

Line 282 Invoked each timer tick.	Line 290 Invoked each timer tick.


sub Tick {	sub Tick {
	my ($Event) = @_;
	my $clock_watcher = $Event->w;

my $client;	my $client;
if($ConnectionRetriesLeft > 0) {	if($ConnectionRetriesLeft > 0) {
ShowStatus(GetServerHost()." Connection count: ".$ConnectionCount	ShowStatus(GetServerHost()." Connection count: ".$ConnectionCount
." Retries remaining: ".$ConnectionRetriesLeft);	." Retries remaining: ".$ConnectionRetriesLeft
	." ($KeyMode)");
} else {	} else {
ShowStatus(GetServerHost()." >> DEAD <<");	ShowStatus(GetServerHost()." >> DEAD <<");
}	}
Line 330 sub Tick {	Line 342 sub Tick {
if($successCount == 0) { # All connections failed:	if($successCount == 0) { # All connections failed:
Debug(5,"Work in queue failed to make any connectiouns\n");	Debug(5,"Work in queue failed to make any connectiouns\n");
EmptyQueue(); # Fail pending transactions with con_lost.	EmptyQueue(); # Fail pending transactions with con_lost.
	CloseAllLondConnections(); # Should all be closed but....
}	}
} else {	} else {
ShowStatus(GetServerHost()." >>> DEAD!!! <<<");	ShowStatus(GetServerHost()." >>> DEAD!!! <<<");
Debug(5,"Work in queue, but gave up on connections..flushing\n");	Debug(5,"Work in queue, but gave up on connections..flushing\n");
EmptyQueue(); # Connections can't be established.	EmptyQueue(); # Connections can't be established.
	CloseAllLondConnections(); # Should all already be closed but...
}	}

}	}
	if ($ConnectionCount == 0) {
	$KeyMode = "";
	$clock_watcher->cancel();
	}
}	}

=pod	=pod
Line 378 long enough, it will be shut down and re	Line 396 long enough, it will be shut down and re

sub ServerToIdle {	sub ServerToIdle {
my $Socket = shift; # Get the socket.	my $Socket = shift; # Get the socket.
	$KeyMode = $Socket->{AuthenticationMode};
delete($ActiveTransactions{$Socket}); # Server has no transaction	delete($ActiveTransactions{$Socket}); # Server has no transaction

&Debug(5, "Server to idle");	&Debug(5, "Server to idle");
Line 457 sub ClientWritable {	Line 476 sub ClientWritable {
} else { # Partial string sent.	} else { # Partial string sent.
$Watcher->data(substr($Data, $result));	$Watcher->data(substr($Data, $result));
if($result == 0) { # client hung up on us!!	if($result == 0) { # client hung up on us!!
Log("INFO", "lonc pipe client hung up on us!");	# Log("INFO", "lonc pipe client hung up on us!");
$Watcher->cancel;	$Watcher->cancel;
$Socket->shutdown(2);	$Socket->shutdown(2);
$Socket->close();	$Socket->close();
Line 510 The transaction that is being completed.	Line 529 The transaction that is being completed.

sub CompleteTransaction {	sub CompleteTransaction {
&Debug(5,"Complete transaction");	&Debug(5,"Complete transaction");
my $Socket = shift;
my $Transaction = shift;	my ($Socket, $Transaction) = @_;

if (!$Transaction->isDeferred()) { # Normal transaction	if (!$Transaction->isDeferred()) { # Normal transaction
my $data = $Socket->GetReply(); # Data to send.	my $data = $Socket->GetReply(); # Data to send.
Line 525 sub CompleteTransaction {	Line 544 sub CompleteTransaction {
unlink $Transaction->getFile();	unlink $Transaction->getFile();
}	}
}	}

=pod	=pod

=head1 StartClientReply	=head1 StartClientReply

Initiates a reply to a client where the reply data is a parameter.	Initiates a reply to a client where the reply data is a parameter.
Line 541 sub CompleteTransaction {	Line 562 sub CompleteTransaction {
The data to send to apached client.	The data to send to apached client.

=cut	=cut

sub StartClientReply {	sub StartClientReply {
my $Transaction = shift;
my $data = shift;

	my ($Transaction, $data) = @_;

my $Client = $Transaction->getClient();	my $Client = $Transaction->getClient();

Line 558 sub StartClientReply {	Line 579 sub StartClientReply {
cb => \&ClientWritable,	cb => \&ClientWritable,
data => $data);	data => $data);
}	}

=pod	=pod

=head2 FailTransaction	=head2 FailTransaction

Finishes a transaction with failure because the associated lond socket	Finishes a transaction with failure because the associated lond socket
Line 568 sub StartClientReply {	Line 591 sub StartClientReply {
- The transaction is 'live' in which case we initiate the sending	- The transaction is 'live' in which case we initiate the sending
of "con_lost" to the client.	of "con_lost" to the client.

Deleting the transaction means killing it from the	Deleting the transaction means killing it from the %ActiveTransactions hash.
%ActiveTransactions hash.

Parameters:	Parameters:

Line 577 Parameters:	Line 599 Parameters:

The LondTransaction we are failing.	The LondTransaction we are failing.


=cut	=cut

sub FailTransaction {	sub FailTransaction {
my $transaction = shift;	my $transaction = shift;
Log("WARNING", "Failing transaction ".$transaction->getRequest());
	# If the socket is dead, that's already logged.

	if ($ConnectionRetriesLeft > 0) {
	Log("WARNING", "Failing transaction "
	.$transaction->getRequest());
	}
Debug(1, "Failing transaction: ".$transaction->getRequest());	Debug(1, "Failing transaction: ".$transaction->getRequest());
if (!$transaction->isDeferred()) { # If the transaction is deferred we'll get to it.	if (!$transaction->isDeferred()) { # If the transaction is deferred we'll get to it.
my $client = $transaction->getClient();	my $client = $transaction->getClient();
Debug(1," Replying con_lost to ".$transaction->getRequest());	Debug(1," Replying con_lost to ".$transaction->getRequest());
StartClientReply($transaction, "con_lost\n");	StartClientReply($transaction, "con_lost\n");
}	}
if($ConnectionRetriesLeft <= 0) {
Log("CRITICAL", "Host marked dead: ".GetServerHost());
}

}	}

Line 618 Close all connections open on lond prior	Line 644 Close all connections open on lond prior
=cut	=cut
sub CloseAllLondConnections {	sub CloseAllLondConnections {
foreach my $Socket (keys %ActiveConnections) {	foreach my $Socket (keys %ActiveConnections) {
KillSocket($Socket);	if(exists($ActiveTransactions{$Socket})) {
	FailTransaction($ActiveTransactions{$Socket});
	}
	KillSocket($Socket);
}	}
}	}
=cut	=cut
Line 670 sub KillSocket {	Line 699 sub KillSocket {
#	#
if($ConnectionCount == 0) {	if($ConnectionCount == 0) {
EmptyQueue();	EmptyQueue();
	CloseAllLondConnections; # Should all already be closed but...
}	}
}	}

Line 695 The connection must echo the challenge b	Line 725 The connection must echo the challenge b
The challenge has been replied to. The we are receiveing the	The challenge has been replied to. The we are receiveing the
'ok' from the partner.	'ok' from the partner.

	=head3 State=ReadingVersionString

	We have requested the lond version and are reading the
	version back. Upon completion, we'll store the version away
	for future use(?).

	=head3 State=HostSet

	We have selected the domain name of our peer (multhomed hosts)
	and are getting the reply (presumably ok) back.

=head3 State=RequestingKey	=head3 State=RequestingKey

The ok has been received and we need to send the request for	The ok has been received and we need to send the request for
Line 749 sub LondReadable {	Line 790 sub LondReadable {
&Debug(2, "Socket->Readable returned: $status");	&Debug(2, "Socket->Readable returned: $status");

if($status != 0) {	if($status != 0) {
# bad return from socket read. Currently this means that	# bad return from socket read. Currently this means that
# The socket has become disconnected. We fail the transaction.	# The socket has become disconnected. We fail the transaction.

Log("WARNING",	Log("WARNING",
Line 767 sub LondReadable {	Line 808 sub LondReadable {
$State = $Socket->GetState(); # Update in case of transition.	$State = $Socket->GetState(); # Update in case of transition.
&Debug(6, "After read, state is ".$State);	&Debug(6, "After read, state is ".$State);

if($State eq "Initialized") {	if($State eq "Initialized") {


} elsif ($State eq "ChallengeReceived") {	} elsif ($State eq "ChallengeReceived") {
# The challenge must be echoed back; The state machine	# The challenge must be echoed back; The state machine
# in the connection takes care of setting that up. Just	# in the connection takes care of setting that up. Just
# need to transition to writable:	# need to transition to writable:

$Watcher->cb(\&LondWritable);	$Watcher->cb(\&LondWritable);
$Watcher->poll("w");	$Watcher->poll("w");

} elsif ($State eq "ChallengeReplied") {	} elsif ($State eq "ChallengeReplied") {

	} elsif ($State eq "RequestingVersion") {
	# Need to ask for the version... that is writiability:

	$Watcher->cb(\&LondWritable);
	$Watcher->poll("w");

	} elsif ($State eq "ReadingVersionString") {
	# Read the rest of the version string...
	} elsif ($State eq "SetHost") {
	# Need to request the actual domain get set...

	$Watcher->cb(\&LondWritable);
	$Watcher->poll("w");
	} elsif ($State eq "HostSet") {
	# Reading the 'ok' from the peer.

} elsif ($State eq "RequestingKey") {	} elsif ($State eq "RequestingKey") {
# The ok was received. Now we need to request the key	# The ok was received. Now we need to request the key
Line 791 sub LondReadable {	Line 847 sub LondReadable {
} elsif ($State eq "ReceivingKey") {	} elsif ($State eq "ReceivingKey") {

} elsif ($State eq "Idle") {	} elsif ($State eq "Idle") {

	# This is as good a spot as any to get the peer version
	# string:

	if($LondVersion eq "unknown") {
	$LondVersion = $Socket->PeerVersion();
	Log("INFO", "Connected to lond version: $LondVersion");
	}
# If necessary, complete a transaction and then go into the	# If necessary, complete a transaction and then go into the
# idle queue.	# idle queue.
# Note that a trasition to idle indicates a live lond	# Note that a trasition to idle indicates a live lond
Line 820 sub LondReadable {	Line 884 sub LondReadable {


} else {	} else {
# Invalid state.	# Invalid state.
Debug(4, "Invalid state in LondReadable");	Debug(4, "Invalid state in LondReadable");
}	}
}	}
Line 902 sub LondWritable {	Line 966 sub LondWritable {

SocketDump(6,$Socket);	SocketDump(6,$Socket);

if ($State eq "Connected") {	# If the socket is writable, we must always write.
	# Only by writing will we undergo state transitions.
if ($Socket->Writable() != 0) {	# Old logic wrote in state specific code below, however
# The write resulted in an error.	# That forces us at least through another invocation of
# We'll treat this as if the socket got disconnected:	# this function after writability is possible again.
Log("WARNING", "Connection to ".$RemoteHost.	# This logic also factors out common code for handling
" has been disconnected");	# write failures... in all cases, write failures
	# Kill the socket.
	# This logic makes the branches of the >big< if below
	# so that the writing states are actually NO-OPs.

	if ($Socket->Writable() != 0) {
	# The write resulted in an error.
	# We'll treat this as if the socket got disconnected:
	Log("WARNING", "Connection to ".$RemoteHost.
	" has been disconnected");
	if(exists($ActiveTransactions{$Socket})) {
FailTransaction($ActiveTransactions{$Socket});	FailTransaction($ActiveTransactions{$Socket});
$Watcher->cancel();
KillSocket($Socket);
return;
}	}
# "init" is being sent...	$Watcher->cancel();
	KillSocket($Socket);
	return;
	}



	if ($State eq "Connected") {

	# "init" is being sent...

} elsif ($State eq "Initialized") {	} elsif ($State eq "Initialized") {

# Now that init was sent, we switch	# Now that init was sent, we switch
Line 924 sub LondWritable {	Line 1003 sub LondWritable {

$Watcher->cb(\&LondReadable);	$Watcher->cb(\&LondReadable);
$Watcher->poll("r");	$Watcher->poll("r");

} elsif ($State eq "ChallengeReceived") {	} elsif ($State eq "ChallengeReceived") {
# We received the challenge, now we	# We received the challenge, now we
# are echoing it back. This is a no-op,	# are echoing it back. This is a no-op,
# we're waiting for the state to change	# we're waiting for the state to change

if($Socket->Writable() != 0) {

$Watcher->cancel();
KillSocket($Socket);
return;
}

} elsif ($State eq "ChallengeReplied") {	} elsif ($State eq "ChallengeReplied") {
# The echo was sent back, so we switch	# The echo was sent back, so we switch
# to watching readability.	# to watching readability.

$Watcher->cb(\&LondReadable);	$Watcher->cb(\&LondReadable);
$Watcher->poll("r");	$Watcher->poll("r");
	} elsif ($State eq "RequestingVersion") {
	# Sending the peer a version request...

	} elsif ($State eq "ReadingVersionString") {
	# Transition to read since we have sent the
	# version command and now just need to read the
	# version string from the peer:

	$Watcher->cb(\&LondReadable);
	$Watcher->poll("r");

	} elsif ($State eq "SetHost") {
	# Setting the remote domain...

	} elsif ($State eq "HostSet") {
	# Back to readable to get the ok.

	$Watcher->cb(\&LondReadable);
	$Watcher->poll("r");


} elsif ($State eq "RequestingKey") {	} elsif ($State eq "RequestingKey") {
# At this time we're requesting the key.	# At this time we're requesting the key.
# again, this is essentially a no-op.	# again, this is essentially a no-op.
# we'll write the next chunk until the
# state changes.

if($Socket->Writable() != 0) {
# Write resulted in an error.

$Watcher->cancel();
KillSocket($Socket);
return;

}
} elsif ($State eq "ReceivingKey") {	} elsif ($State eq "ReceivingKey") {
# Now we need to wait for the key	# Now we need to wait for the key
# to come back from the peer:	# to come back from the peer:
Line 966 sub LondWritable {	Line 1048 sub LondWritable {
$Watcher->poll("r");	$Watcher->poll("r");

} elsif ($State eq "SendingRequest") {	} elsif ($State eq "SendingRequest") {

# At this time we are sending a request to the	# At this time we are sending a request to the
# peer... write the next chunk:	# peer... write the next chunk:

if($Socket->Writable() != 0) {

if(exists($ActiveTransactions{$Socket})) {
Debug(3, "Lond connection lost, failing transactions");
FailTransaction($ActiveTransactions{$Socket});
}
$Watcher->cancel();
KillSocket($Socket);
return;

}

} elsif ($State eq "ReceivingReply") {	} elsif ($State eq "ReceivingReply") {
# The send has completed. Wait for the	# The send has completed. Wait for the
Line 1072 sub MakeLondConnection {	Line 1144 sub MakeLondConnection {
data => $Connection,	data => $Connection,
desc => 'Connection to lond server');	desc => 'Connection to lond server');
$ActiveConnections{$Connection} = $event;	$ActiveConnections{$Connection} = $event;
	if ($ConnectionCount == 0) {
	&SetupTimer; # Need to handle timeouts with connections...
	}
$ConnectionCount++;	$ConnectionCount++;
Debug(4, "Connection count = ".$ConnectionCount);	Debug(4, "Connection count = ".$ConnectionCount);
if($ConnectionCount == 1) { # First Connection:	if($ConnectionCount == 1) { # First Connection:
Line 1111 The text of the request to send.	Line 1185 The text of the request to send.
=cut	=cut

sub StartRequest {	sub StartRequest {
my $Lond = shift;
my $Request = shift; # This is a LondTransaction.	my ($Lond, $Request) = @_;

Debug(6, "StartRequest: ".$Request->getRequest());	Debug(6, "StartRequest: ".$Request->getRequest());

Line 1168 sub QueueTransaction {	Line 1242 sub QueueTransaction {
Debug(5,"Starting additional lond connection");	Debug(5,"Starting additional lond connection");
if(MakeLondConnection() == 0) {	if(MakeLondConnection() == 0) {
EmptyQueue(); # Fail transactions, can't make connection.	EmptyQueue(); # Fail transactions, can't make connection.
	CloseAllLondConnections; # Should all be closed but...
}	}
} else {	} else {
ShowStatus(GetServerHost()." >>> DEAD !!!! <<<");	ShowStatus(GetServerHost()." >>> DEAD !!!! <<<");
EmptyQueue(); # It's worse than that ... he's dead Jim.	EmptyQueue(); # It's worse than that ... he's dead Jim.
	CloseAllLondConnections; # Should all be closed but..
}	}
}	}
} else { # Can start the request:	} else { # Can start the request:
Line 1214 sub ClientRequest {	Line 1290 sub ClientRequest {
Debug(8,"Data: ".$data." this read: ".$thisread);	Debug(8,"Data: ".$data." this read: ".$thisread);
$data = $data.$thisread; # Append new data.	$data = $data.$thisread; # Append new data.
$watcher->data($data);	$watcher->data($data);
if($data =~ /(.*\n)/) { # Request entirely read.	if($data =~ /\n$/) { # Request entirely read.
if($data eq "close_connection_exit\n") {	if($data eq "close_connection_exit\n") {
Log("CRITICAL",	Log("CRITICAL",
"Request Close Connection ... exiting");	"Request Close Connection ... exiting");
Line 1361 into the status file.	Line 1437 into the status file.
We also use this to reset the retries count in order to allow the	We also use this to reset the retries count in order to allow the
client to retry connections with a previously dead server.	client to retry connections with a previously dead server.
=cut	=cut

sub ChildStatus {	sub ChildStatus {
my $event = shift;	my $event = shift;
my $watcher = $event->w;	my $watcher = $event->w;
Line 1373 sub ChildStatus {	Line 1450 sub ChildStatus {
#	#
# Write out information about each of the connections:	# Write out information about each of the connections:
#	#
print $fh "Active connection statuses: \n";	if ($DebugLevel > 2) {
my $i = 1;	print $fh "Active connection statuses: \n";
print STDERR "================================= Socket Status Dump:\n";	my $i = 1;
foreach my $item (keys %ActiveConnections) {	print STDERR "================================= Socket Status Dump:\n";
my $Socket = $ActiveConnections{$item}->data;	foreach my $item (keys %ActiveConnections) {
my $state = $Socket->GetState();	my $Socket = $ActiveConnections{$item}->data;
print $fh "Connection $i State: $state\n";	my $state = $Socket->GetState();
print STDERR "---------------------- Connection $i \n";	print $fh "Connection $i State: $state\n";
$Socket->Dump();	print STDERR "---------------------- Connection $i \n";
$i++;	$Socket->Dump(-1); # Ensure it gets dumped..
	$i++;
	}
}	}
$ConnectionRetriesLeft = $ConnectionRetries;	$ConnectionRetriesLeft = $ConnectionRetries;
}	}
Line 1454 sub ChildProcess {	Line 1533 sub ChildProcess {
cb => \&ToggleDebug,	cb => \&ToggleDebug,
data => "INT");	data => "INT");

SetupTimer();

SetupLoncListener();	SetupLoncListener();

Line 1477 sub ChildProcess {	Line 1555 sub ChildProcess {
# Create a new child for host passed in:	# Create a new child for host passed in:

sub CreateChild {	sub CreateChild {
	my $host = shift;

my $sigset = POSIX::SigSet->new(SIGINT);	my $sigset = POSIX::SigSet->new(SIGINT);
sigprocmask(SIG_BLOCK, $sigset);	sigprocmask(SIG_BLOCK, $sigset);
my $host = shift;
$RemoteHost = $host;	$RemoteHost = $host;
Log("CRITICAL", "Forking server for ".$host);	Log("CRITICAL", "Forking server for ".$host);
my $pid = fork;	my $pid = fork;
Line 1750 sub KillThemAll {	Line 1829 sub KillThemAll {
local($SIG{CHLD}) = 'IGNORE'; # Our children >will< die.	local($SIG{CHLD}) = 'IGNORE'; # Our children >will< die.
foreach my $pid (keys %ChildHash) {	foreach my $pid (keys %ChildHash) {
my $serving = $ChildHash{$pid};	my $serving = $ChildHash{$pid};
Debug(2, "Killing lonc for $serving pid = $pid");	ShowStatus("Nicely Killing lonc for $serving pid = $pid");
ShowStatus("Killing lonc for $serving pid = $pid");	Log("CRITICAL", "Nicely Killing lonc for $serving pid = $pid");
Log("CRITICAL", "Killing lonc for $serving pid = $pid");
kill 'QUIT' => $pid;	kill 'QUIT' => $pid;
delete($ChildHash{$pid});
}	}
my $execdir = $perlvar{'lonDaemons'};
unlink("$execdir/logs/lonc.pid");

}	}


	#
	# Kill all children via KILL. Just in case the
	# first shot didn't get them.

	sub really_kill_them_all_dammit
	{
	Debug(2, "Kill them all Dammit");
	local($SIG{CHLD} = 'IGNORE'); # In case some purist reenabled them.
	foreach my $pid (keys %ChildHash) {
	my $serving = $ChildHash{$pid};
	&ShowStatus("Nastily killing lonc for $serving pid = $pid");
	Log("CRITICAL", "Nastily killing lonc for $serving pid = $pid");
	kill 'KILL' => $pid;
	delete($ChildHash{$pid});
	my $execdir = $perlvar{'lonDaemons'};
	unlink("$execdir/logs/lonc.pid");
	}
	}
=pod	=pod

=head1 Terminate	=head1 Terminate
Line 1770 Terminate the system.	Line 1865 Terminate the system.
=cut	=cut

sub Terminate {	sub Terminate {
KillThemAll;	&Log("CRITICAL", "Asked to kill children.. first be nice...");
	&KillThemAll;
	#
	# By now they really should all be dead.. but just in case
	# send them all SIGKILL's after a bit of waiting:

	sleep(4);
	&Log("CRITICAL", "Now kill children nasty");
	&really_kill_them_all_dammit;
Log("CRITICAL","Master process exiting");	Log("CRITICAL","Master process exiting");
exit 0;	exit 0;

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

Removed from v.1.39
changed lines
	Added in v.1.52