loncom/loncnew - diff

Return to loncnew CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/loncnew between versions 1.41 and 1.76

version 1.41, 2004/02/09 13:39:28	version 1.76, 2006/08/25 21:12:19
Line 61 use LONCAPA::LondConnection;	Line 61 use LONCAPA::LondConnection;
use LONCAPA::LondTransaction;	use LONCAPA::LondTransaction;
use LONCAPA::Configuration;	use LONCAPA::Configuration;
use LONCAPA::HashIterator;	use LONCAPA::HashIterator;
	use Fcntl qw(:flock);


# Read the httpd configuration file to get perl variables	# Read the httpd configuration file to get perl variables
Line 75 my %perlvar = %{$perlvarref};	Line 76 my %perlvar = %{$perlvarref};
my %ChildHash; # by pid -> host.	my %ChildHash; # by pid -> host.
my %HostToPid; # By host -> pid.	my %HostToPid; # By host -> pid.
my %HostHash; # by loncapaname -> IP.	my %HostHash; # by loncapaname -> IP.
	my %listening_to; # Socket->host table for who the parent
	# is listening to.
	my %parent_dispatchers; # host-> listener watcher events.

	my %parent_handlers; # Parent signal handlers...

my $MaxConnectionCount = 10; # Will get from config later.	my $MaxConnectionCount = 10; # Will get from config later.
my $ClientConnection = 0; # Uniquifier for client events.	my $ClientConnection = 0; # Uniquifier for client events.

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.
	my $executable = $0; # Get the full path to me.

#	#
# The variables below are only used by the child processes.	# The variables below are only used by the child processes.
Line 100 my $ConnectionCount = 0;	Line 106 my $ConnectionCount = 0;
my $IdleSeconds = 0; # Number of seconds idle.	my $IdleSeconds = 0; # Number of seconds idle.
my $Status = ""; # Current status string.	my $Status = ""; # Current status string.
my $RecentLogEntry = "";	my $RecentLogEntry = "";
my $ConnectionRetries=2; # Number of connection retries allowed.	my $ConnectionRetries=5; # Number of connection retries allowed.
my $ConnectionRetriesLeft=2; # Number of connection retries remaining.	my $ConnectionRetriesLeft=5; # Number of connection retries remaining.
my $LondVersion = "unknown"; # Version of lond we talk with.	my $LondVersion = "unknown"; # Version of lond we talk with.
	my $KeyMode = ""; # e.g. ssl, local, insecure from last connect.
	my $LondConnecting = 0; # True when a connection is being built.



	my $DieWhenIdle = 1; # When true children die when trimmed -> 0.
	my $I_am_child = 0; # True if this is the child process.

#	#
# The hash below gives the HTML format for log messages	# The hash below gives the HTML format for log messages
Line 110 my $LondVersion = "unknown"; # Versi	Line 123 my $LondVersion = "unknown"; # Versi
#	#
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 ";


	# UpdateStatus;
	# Update the idle status display to show how many connections
	# are left, retries and other stuff.
	#
	sub UpdateStatus {
	if ($ConnectionRetriesLeft > 0) {
	ShowStatus(GetServerHost()." Connection count: ".$ConnectionCount
	." Retries remaining: ".$ConnectionRetriesLeft
	." ($KeyMode)");
	} else {
	ShowStatus(GetServerHost()." >> DEAD <<");
	}
	}


=pod	=pod

Line 125 $LogFormats{"DEFAULT"} = " %s ";	Line 152 $LogFormats{"DEFAULT"} = " %s ";
Makes an entry into the permanent log file.	Makes an entry into the permanent log file.

=cut	=cut

sub LogPerm {	sub LogPerm {
my $message=shift;	my $message=shift;
my $execdir=$perlvar{'lonDaemons'};	my $execdir=$perlvar{'lonDaemons'};
Line 156 host and the time will be formatted into	Line 184 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 170 sub Log {	Line 198 sub Log {
my $now = time;	my $now = time;
my $local = localtime($now);	my $local = localtime($now);
my $finalformat = "$local ($$) [$RemoteHost] [$Status] ";	my $finalformat = "$local ($$) [$RemoteHost] [$Status] ";
my $finalformat = $finalformat.$format."\n";	$finalformat = $finalformat.$format."\n";

# open the file and put the result.	# open the file and put the result.

Line 193 Returns the name of the host that a sock	Line 221 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 217 Invoked to issue a debug message.	Line 247 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 240 sub SocketDump {	Line 272 sub SocketDump {
and as what we return in a SIGUSR1	and as what we return in a SIGUSR1

=cut	=cut

sub ShowStatus {	sub ShowStatus {
my $state = shift;	my $state = shift;
my $now = time;	my $now = time;
Line 250 sub ShowStatus {	Line 283 sub ShowStatus {

=pod	=pod

=head 2 SocketTimeout	=head2 SocketTimeout

Called when an action on the socket times out. The socket is	Called when an action on the socket times out. The socket is
destroyed and any active transaction is failed.	destroyed and any active transaction is failed.


=cut	=cut

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());
	$LondConnecting = 0;
	}

	}
	#
	# This function should be called by the child in all cases where it must
	# exit. If the child process is running with the DieWhenIdle turned on
	# it must create a lock file for the AF_UNIX socket in order to prevent
	# connection requests from lonnet in the time between process exit
	# and the parent picking up the listen again.
	# Parameters:
	# exit_code - Exit status value, however see the next parameter.
	# message - If this optional parameter is supplied, the exit
	# is via a die with this message.
	#
	sub child_exit {
	my ($exit_code, $message) = @_;

	# Regardless of how we exit, we may need to do the lock thing:

	if($DieWhenIdle) {
	#
	# Create a lock file since there will be a time window
	# between our exit and the parent's picking up the listen
	# during which no listens will be done on the
	# lonnet client socket.
	#
	my $lock_file = GetLoncSocketPath().".lock";
	open(LOCK,">$lock_file");
	print LOCK "Contents not important";
	close(LOCK);

	exit(0);
	}
	# Now figure out how we exit:

	if($message) {
	die $message;
	} else {
	exit($exit_code);
	}
}	}
#----------------------------- Timer management ------------------------	#----------------------------- Timer management ------------------------

Line 278 Invoked each timer tick.	Line 358 Invoked each timer tick.


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

my $client;	my $client;
if($ConnectionRetriesLeft > 0) {	UpdateStatus();
ShowStatus(GetServerHost()." Connection count: ".$ConnectionCount
." Retries remaining: ".$ConnectionRetriesLeft);
} else {
ShowStatus(GetServerHost()." >> DEAD <<");
}
# Is it time to prune connection count:	# Is it time to prune connection count:


Line 294 sub Tick {	Line 373 sub Tick {
if($IdleSeconds > $IdleTimeout) { # Prune a connection...	if($IdleSeconds > $IdleTimeout) { # Prune a connection...
my $Socket = $IdleConnections->pop();	my $Socket = $IdleConnections->pop();
KillSocket($Socket);	KillSocket($Socket);
	$IdleSeconds = 0; # Otherwise all connections get trimmed to fast.
	UpdateStatus();
	if(($ConnectionCount == 0) && $DieWhenIdle) {
	&child_exit(0);

	}
}	}
} else {	} else {
$IdleSeconds = 0; # Reset idle count if not idle.	$IdleSeconds = 0; # Reset idle count if not idle.
Line 312 sub Tick {	Line 397 sub Tick {
# Do we have work in the queue, but no connections to service them?	# Do we have work in the queue, but no connections to service them?
# If so, try to make some new connections to get things going again.	# If so, try to make some new connections to get things going again.
#	#
	# Note this code is dead now...
	#
my $Requests = $WorkQueue->Count();	my $Requests = $WorkQueue->Count();
if (($ConnectionCount == 0) && ($Requests > 0)) {	if (($ConnectionCount == 0) && ($Requests > 0) && (!$LondConnecting)) {
if ($ConnectionRetriesLeft > 0) {	if ($ConnectionRetriesLeft > 0) {
my $Connections = ($Requests <= $MaxConnectionCount) ?	Debug(5,"Work but no connections, Make a new one");
$Requests : $MaxConnectionCount;	my $success;
Debug(5,"Work but no connections, start ".$Connections." of them");	$success = &MakeLondConnection;
my $successCount = 0;	if($success == 0) { # All connections failed:
for (my $i =0; $i < $Connections; $i++) {
$successCount += MakeLondConnection();
}
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 {
	$LondConnecting = 0;
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();
	}
	&UpdateStatus();
}	}

=pod	=pod
Line 374 long enough, it will be shut down and re	Line 464 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 453 sub ClientWritable {	Line 544 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 506 The transaction that is being completed.	Line 597 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 521 sub CompleteTransaction {	Line 612 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 537 sub CompleteTransaction {	Line 630 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 554 sub StartClientReply {	Line 647 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 564 sub StartClientReply {	Line 659 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 573 Parameters:	Line 667 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());
Debug(1, "Failing transaction: ".$transaction->getRequest());	# If the socket is dead, that's already logged.

	if ($ConnectionRetriesLeft > 0) {
	Log("WARNING", "Failing transaction "
	.$transaction->getLoggableRequest());
	}
	Debug(1, "Failing transaction: ".$transaction->getLoggableRequest());
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());
}

}	}

=pod	=pod

=head1 EmptyQueue	=head1 EmptyQueue

Fails all items in the work queue with con_lost.	Fails all items in the work queue with con_lost.
Note that each item in the work queue is a transaction.	Note that each item in the work queue is a transaction.

=cut	=cut

sub EmptyQueue {	sub EmptyQueue {
$ConnectionRetriesLeft--; # Counts as connection failure too.	$ConnectionRetriesLeft--; # Counts as connection failure too.
while($WorkQueue->Count()) {	while($WorkQueue->Count()) {
Line 612 sub EmptyQueue {	Line 712 sub EmptyQueue {
Close all connections open on lond prior to exit e.g.	Close all connections open on lond prior to exit e.g.

=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

=pod	=pod

Line 639 Parameters:	Line 742 Parameters:

nonzero if we are allowed to create a new connection.	nonzero if we are allowed to create a new connection.


=cut	=cut

sub KillSocket {	sub KillSocket {
my $Socket = shift;	my $Socket = shift;

Line 666 sub KillSocket {	Line 769 sub KillSocket {
#	#
if($ConnectionCount == 0) {	if($ConnectionCount == 0) {
EmptyQueue();	EmptyQueue();
	CloseAllLondConnections; # Should all already be closed but...
}	}
}	}

Line 763 sub LondReadable {	Line 867 sub LondReadable {
"Lond connection lost.");	"Lond connection lost.");
if(exists($ActiveTransactions{$Socket})) {	if(exists($ActiveTransactions{$Socket})) {
FailTransaction($ActiveTransactions{$Socket});	FailTransaction($ActiveTransactions{$Socket});
	} else {
	# Socket is connecting and failed... need to mark
	# no longer connecting.

	$LondConnecting = 0;
}	}
$Watcher->cancel();	$Watcher->cancel();
KillSocket($Socket);	KillSocket($Socket);
Line 837 sub LondReadable {	Line 946 sub LondReadable {
.$RemoteHost." now ready for action");	.$RemoteHost." now ready for action");
}	}
ServerToIdle($Socket); # Next work unit or idle.	ServerToIdle($Socket); # Next work unit or idle.

	#
	$LondConnecting = 0; # Best spot I can think of for this.
	#

} elsif ($State eq "SendingRequest") {	} elsif ($State eq "SendingRequest") {
# We need to be writable for this and probably don't belong	# We need to be writable for this and probably don't belong
# here inthe first place.	# here inthe first place.

Deubg(6, "SendingRequest state encountered in readable");	Debug(6, "SendingRequest state encountered in readable");
$Watcher->poll("w");	$Watcher->poll("w");
$Watcher->cb(\&LondWritable);	$Watcher->cb(\&LondWritable);

Line 932 sub LondWritable {	Line 1045 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();	} else {
KillSocket($Socket);	# In the process of conneting, so need to turn that off.
return;
	$LondConnecting = 0;
}	}
	$Watcher->cancel();
	KillSocket($Socket);
	return;
	}



	if ($State eq "Connected") {

# "init" is being sent...	# "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 960 sub LondWritable {	Line 1092 sub LondWritable {
# 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.
Line 975 sub LondWritable {	Line 1100 sub LondWritable {
$Watcher->poll("r");	$Watcher->poll("r");
} elsif ($State eq "RequestingVersion") {	} elsif ($State eq "RequestingVersion") {
# Sending the peer a version request...	# Sending the peer a version request...

if($Socket->Writable() != 0) {
$Watcher->cancel();
KillSocket($Socket);
return;
}
} elsif ($State eq "ReadingVersionString") {	} elsif ($State eq "ReadingVersionString") {
# Transition to read since we have sent the	# Transition to read since we have sent the
# version command and now just need to read the	# version command and now just need to read the
Line 991 sub LondWritable {	Line 1111 sub LondWritable {

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

if($Socket->Writable() != 0) {
$Watcher->cancel();
KillSocket($Socket);
return;
}
} elsif ($State eq "HostSet") {	} elsif ($State eq "HostSet") {
# Back to readable to get the ok.	# Back to readable to get the ok.

Line 1007 sub LondWritable {	Line 1122 sub LondWritable {
} 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 1030 sub LondWritable {	Line 1135 sub LondWritable {
# 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 1062 sub LondWritable {	Line 1156 sub LondWritable {
=pod	=pod

=cut	=cut

sub QueueDelayed {	sub QueueDelayed {
Debug(3,"QueueDelayed called");	Debug(3,"QueueDelayed called");

Line 1069 sub QueueDelayed {	Line 1164 sub QueueDelayed {

Debug(4, "Delayed path: ".$path);	Debug(4, "Delayed path: ".$path);
opendir(DIRHANDLE, $path);	opendir(DIRHANDLE, $path);

my @alldelayed = grep /\.$RemoteHost$/, readdir DIRHANDLE;	my @all_host_ids;
	my $host_iterator = &LondConnection::GetHostIterator();
	while (!$host_iterator->end()) {
	my ($host_id,$host_name) = @{$host_iterator->get()}[0,3];
	if ($host_name eq $RemoteHost) {
	push(@all_host_ids, $host_id);
	}
	$host_iterator->next();
	}
	my $host_id_re = '(?:'.join('\|',@all_host_ids).')';
	my @alldelayed = grep(/\.$host_id_re$/, readdir(DIRHANDLE));
closedir(DIRHANDLE);	closedir(DIRHANDLE);
my $dfname;	foreach my $dfname (sort(@alldelayed)) {
my $reqfile;	my $reqfile = "$path/$dfname";
foreach $dfname (sort @alldelayed) {	my ($host_id) = ($dfname =~ /\.([^.]*)$/);
$reqfile = "$path/$dfname";	Debug(4, "queueing ".$reqfile." for $host_id");
Debug(4, "queueing ".$reqfile);
my $Handle = IO::File->new($reqfile);	my $Handle = IO::File->new($reqfile);
my $cmd = <$Handle>;	my $cmd = <$Handle>;
chomp $cmd; # There may or may not be a newline...	chomp $cmd; # There may or may not be a newline...
$cmd = $cmd."\n"; # now for sure there's exactly one newline.	$cmd = $cmd."\n"; # now for sure there's exactly one newline.
my $Transaction = LondTransaction->new($cmd);	my $Transaction = LondTransaction->new("sethost:$host_id:$cmd");
$Transaction->SetDeferred($reqfile);	$Transaction->SetDeferred($reqfile);
QueueTransaction($Transaction);	QueueTransaction($Transaction);
}	}
Line 1120 sub MakeLondConnection {	Line 1224 sub MakeLondConnection {
#	#
my $Socket = $Connection->GetSocket();	my $Socket = $Connection->GetSocket();
if($Socket eq undef) {	if($Socket eq undef) {
die "did not get a socket from the connection";	&child_exit(-1, "did not get a socket from the connection");
} else {	} else {
&Debug(9,"MakeLondConnection got socket: ".$Socket);	&Debug(9,"MakeLondConnection got socket: ".$Socket);
}	}
Line 1133 sub MakeLondConnection {	Line 1237 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 1141 sub MakeLondConnection {	Line 1247 sub MakeLondConnection {
}	}
Log("SUCESS", "Created connection ".$ConnectionCount	Log("SUCESS", "Created connection ".$ConnectionCount
." to host ".GetServerHost());	." to host ".GetServerHost());
	$LondConnecting = 1; # Connection in progress.
return 1; # Return success.	return 1; # Return success.
}	}

Line 1172 The text of the request to send.	Line 1279 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 1224 sub QueueTransaction {	Line 1331 sub QueueTransaction {
if(!defined $LondSocket) { # Need to queue request.	if(!defined $LondSocket) { # Need to queue request.
Debug(5,"Must queue...");	Debug(5,"Must queue...");
$WorkQueue->enqueue($requestData);	$WorkQueue->enqueue($requestData);
if($ConnectionCount < $MaxConnectionCount) {	Debug(5, "Queue Transaction startnew $ConnectionCount $LondConnecting");
	if(($ConnectionCount < $MaxConnectionCount) && (! $LondConnecting)) {

if($ConnectionRetriesLeft > 0) {	if($ConnectionRetriesLeft > 0) {
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 !!!! <<<");
	$LondConnecting = 0;
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 1275 sub ClientRequest {	Line 1387 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 1294 sub ClientRequest {	Line 1406 sub ClientRequest {

}	}

	#
	# Accept a connection request for a client (lonc child) and
	# start up an event watcher to keep an eye on input from that
	# Event. This can be called both from NewClient and from
	# ChildProcess if we are started in DieWhenIdle mode.
	# Parameters:
	# $socket - The listener socket.
	# Returns:
	# NONE
	# Side Effects:
	# An event is made to watch the accepted connection.
	# Active clients hash is updated to reflect the new connection.
	# The client connection count is incremented.
	#
	sub accept_client {
	my ($socket) = @_;

	Debug(8, "Entering accept for lonc UNIX socket\n");
	my $connection = $socket->accept(); # Accept the client connection.
	Debug(8,"Connection request accepted from "
	.GetPeername($connection, AF_UNIX));


	my $description = sprintf("Connection to lonc client %d",
	$ClientConnection);
	Debug(9, "Creating event named: ".$description);
	Event->io(cb => \&ClientRequest,
	poll => 'r',
	desc => $description,
	data => "",
	fd => $connection);
	$ActiveClients{$connection} = $ClientConnection;
	$ClientConnection++;
	}

=pod	=pod

Line 1312 sub NewClient {	Line 1458 sub NewClient {
my $event = shift; # Get the event parameters.	my $event = shift; # Get the event parameters.
my $watcher = $event->w;	my $watcher = $event->w;
my $socket = $watcher->fd; # Get the event' socket.	my $socket = $watcher->fd; # Get the event' socket.
my $connection = $socket->accept(); # Accept the client connection.
Debug(8,"Connection request accepted from "
.GetPeername($connection, AF_UNIX));


my $description = sprintf("Connection to lonc client %d",	&accept_client($socket);
$ClientConnection);
Debug(9, "Creating event named: ".$description);
Event->io(cb => \&ClientRequest,
poll => 'r',
desc => $description,
data => "",
fd => $connection);
$ActiveClients{$connection} = $ClientConnection;
$ClientConnection++;
}	}

=pod	=pod
Line 1336 sub NewClient {	Line 1469 sub NewClient {
Returns the name of the UNIX socket on which to listen for client	Returns the name of the UNIX socket on which to listen for client
connections.	connections.

	=head2 Parameters:

	host (optional) - Name of the host socket to return.. defaults to
	the return from GetServerHost().

=cut	=cut

sub GetLoncSocketPath {	sub GetLoncSocketPath {
return $UnixSocketDir."/".GetServerHost();
	my $host = GetServerHost(); # Default host.
	if (@_) {
	($host) = @_; # Override if supplied.
	}
	return $UnixSocketDir."/".$host;
}	}

=pod	=pod
Line 1376 connection. The event handler establish	Line 1519 connection. The event handler establish
(creating a communcations channel), that int turn will establish	(creating a communcations channel), that int turn will establish
another event handler to subess requests.	another event handler to subess requests.

	=head2 Parameters:

	host (optional) Name of the host to set up a unix socket to.

=cut	=cut

sub SetupLoncListener {	sub SetupLoncListener {

	my $host = GetServerHost(); # Default host.
	if (@_) {
	($host) = @_ # Override host with parameter.
	}

my $socket;	my $socket;
my $SocketName = GetLoncSocketPath();	my $SocketName = GetLoncSocketPath($host);
unlink($SocketName);	unlink($SocketName);
unless ($socket =IO::Socket::UNIX->new(Local => $SocketName,	unless ($socket =IO::Socket::UNIX->new(Local => $SocketName,
Listen => 10,	Listen => 250,
Type => SOCK_STREAM)) {	Type => SOCK_STREAM)) {
die "Failed to create a lonc listner socket";	if($I_am_child) {
	&child_exit(-1, "Failed to create a lonc listener socket");
	} else {
	die "Failed to create a lonc listner socket";
	}
}	}
Event->io(cb => \&NewClient,	return $socket;
poll => 'r',
desc => 'Lonc listener Unix Socket',
fd => $socket);
}	}

#	#
Line 1421 into the status file.	Line 1574 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;

Debug(2, "Reporting child status because : ".$watcher->data);	Debug(2, "Reporting child status because : ".$watcher->data);
my $docdir = $perlvar{'lonDocRoot'};	my $docdir = $perlvar{'lonDocRoot'};
my $fh = IO::File->new(">>$docdir/lon-status/loncstatus.txt");
print $fh $$."\t".$RemoteHost."\t".$Status."\t".	open(LOG,">>$docdir/lon-status/loncstatus.txt");
	flock(LOG,LOCK_EX);
	print LOG $$."\t".$RemoteHost."\t".$Status."\t".
$RecentLogEntry."\n";	$RecentLogEntry."\n";
#	#
# 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 LOG "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 LOG "Connection $i State: $state\n";
$Socket->Dump();	print STDERR "---------------------- Connection $i \n";
$i++;	$Socket->Dump(-1); # Ensure it gets dumped..
	$i++;
	}
}	}
	flock(LOG,LOCK_UN);
	close(LOG);
$ConnectionRetriesLeft = $ConnectionRetries;	$ConnectionRetriesLeft = $ConnectionRetries;
	UpdateStatus();
}	}

=pod	=pod
Line 1466 sub SignalledToDeath {	Line 1628 sub SignalledToDeath {
chomp($signal);	chomp($signal);
Log("CRITICAL", "Abnormal exit. Child $$ for $RemoteHost "	Log("CRITICAL", "Abnormal exit. Child $$ for $RemoteHost "
."died through "."\"$signal\"");	."died through "."\"$signal\"");
LogPerm("F:lonc: $$ on $RemoteHost signalled to death: "	#LogPerm("F:lonc: $$ on $RemoteHost signalled to death: "
."\"$signal\"");	# ."\"$signal\"");
exit 0;	exit 0;

}	}

	=pod

=head2 ToggleDebug	=head2 ToggleDebug

This sub toggles trace debugging on and off.	This sub toggles trace debugging on and off.
Line 1487 sub ToggleDebug {	Line 1651 sub ToggleDebug {

}	}

	=pod

=head2 ChildProcess	=head2 ChildProcess

This sub implements a child process for a single lonc daemon.	This sub implements a child process for a single lonc daemon.
	Optional parameter:
	$socket - if provided, this is a socket already open for listen
	on the client socket. Otherwise, a new listen is set up.

=cut	=cut

sub ChildProcess {	sub ChildProcess {
	# If we are in DieWhenIdle mode, we've inherited all the
	# events of our parent and those have to be cancelled or else
	# all holy bloody chaos will result.. trust me, I already made
	# >that< mistake.

	my $host = GetServerHost();
	foreach my $listener (keys %parent_dispatchers) {
	my $watcher = $parent_dispatchers{$listener};
	my $s = $watcher->fd;
	if ($listener ne $host) { # Close everyone but me.
	Debug(5, "Closing listen socket for $listener");
	$s->close();
	}
	Debug(5, "Killing watcher for $listener");

	$watcher->cancel();
	delete($parent_dispatchers{$listener});

	}

	# kill off the parent's signal handlers too!
	#

	for my $handler (keys %parent_handlers) {
	my $watcher = $parent_handlers{$handler};
	$watcher->cancel();
	delete($parent_handlers{$handler});
	}

	$I_am_child = 1; # Seems like in spite of it all I may still getting
	# parent event dispatches.. flag I'm a child.


#	#
# Signals must be handled by the Event framework...	# Signals must be handled by the Event framework...
#	#

Event->signal(signal => "QUIT",	Event->signal(signal => "QUIT",
cb => \&SignalledToDeath,	cb => \&SignalledToDeath,
Line 1515 sub ChildProcess {	Line 1715 sub ChildProcess {
cb => \&ToggleDebug,	cb => \&ToggleDebug,
data => "INT");	data => "INT");

SetupTimer();	# Figure out if we got passed a socket or need to open one to listen for
	# client requests.
SetupLoncListener();
	my ($socket) = @_;
	if (!$socket) {

	$socket = SetupLoncListener();
	}
	# Establish an event to listen for client connection requests.


	Event->io(cb => \&NewClient,
	poll => 'r',
	desc => 'Lonc Listener Unix Socket',
	fd => $socket);

$Event::Debuglevel = $DebugLevel;	$Event::DebugLevel = $DebugLevel;

Debug(9, "Making initial lond connection for ".$RemoteHost);	Debug(9, "Making initial lond connection for ".$RemoteHost);

# Setup the initial server connection:	# Setup the initial server connection:

# &MakeLondConnection(); // let first work requirest do it.	# &MakeLondConnection(); // let first work request do it.

	# If We are in diwhenidle, need to accept the connection since the
	# event may not fire.

	if ($DieWhenIdle) {
	&accept_client($socket);
	}

Debug(9,"Entering event loop");	Debug(9,"Entering event loop");
my $ret = Event::loop(); # Start the main event loop.	my $ret = Event::loop(); # Start the main event loop.


die "Main event loop exited!!!";	&child_exit (-1,"Main event loop exited!!!");
}	}

# Create a new child for host passed in:	# Create a new child for host passed in:

sub CreateChild {	sub CreateChild {
	my ($host, $socket) = @_;

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 1554 sub CreateChild {	Line 1773 sub CreateChild {
ShowStatus("Connected to ".$RemoteHost);	ShowStatus("Connected to ".$RemoteHost);
$SIG{INT} = 'DEFAULT';	$SIG{INT} = 'DEFAULT';
sigprocmask(SIG_UNBLOCK, $sigset);	sigprocmask(SIG_UNBLOCK, $sigset);
ChildProcess; # Does not return.	if(defined $socket) {
	&ChildProcess($socket);
	} else {
	ChildProcess; # Does not return.
	}
}	}
	}

	# parent_client_connection:
	# Event handler that processes client connections for the parent process.
	# This sub is called when the parent is listening on a socket and
	# a connection request arrives. We must:
	# Start a child process to accept the connection request.
	# Kill our listen on the socket.
	# Parameter:
	# event - The event object that was created to monitor this socket.
	# event->w->fd is the socket.
	# Returns:
	# NONE
	#
	sub parent_client_connection {
	if ($I_am_child) {
	# Should not get here, but seem to anyway:
	&Debug(5," Child caught parent client connection event!!");
	my ($event) = @_;
	my $watcher = $event->w;
	$watcher->cancel(); # Try to kill it off again!!
	} else {
	&Debug(9, "parent_client_connection");
	my ($event) = @_;
	my $watcher = $event->w;
	my $socket = $watcher->fd;

	# Lookup the host associated with this socket:

	my $host = $listening_to{$socket};

	# Start the child:



	&Debug(9,"Creating child for $host (parent_client_connection)");
	&CreateChild($host, $socket);

	# Clean up the listen since now the child takes over until it exits.

	$watcher->cancel(); # Nolonger listening to this event
	delete($listening_to{$socket});
	delete($parent_dispatchers{$host});
	$socket->close();
	}
}	}

	# parent_listen:
	# Opens a socket and starts a listen for the parent process on a client UNIX
	# domain socket.
	#
	# This involves:
	# Creating a socket for listen.
	# Removing any socket lock file
	# Adding an event handler for this socket becoming readable
	# To the parent's event dispatcher.
	# Parameters:
	# loncapa_host - LonCAPA cluster name of the host represented by the client
	# socket.
	# Returns:
	# NONE
	#
	sub parent_listen {
	my ($loncapa_host) = @_;
	Debug(5, "parent_listen: $loncapa_host");

	my $socket = &SetupLoncListener($loncapa_host);
	$listening_to{$socket} = $loncapa_host;
	if (!$socket) {
	die "Unable to create a listen socket for $loncapa_host";
	}

	my $lock_file = &GetLoncSocketPath($loncapa_host).".lock";
	unlink($lock_file); # No problem if it doesn't exist yet [startup e.g.]

	my $watcher = Event->io(cb => \&parent_client_connection,
	poll => 'r',
	desc => "Parent listener unix socket ($loncapa_host)",
	fd => $socket);
	$parent_dispatchers{$loncapa_host} = $watcher;

	}


	# listen_on_all_unix_sockets:
	# This sub initiates a listen on all unix domain lonc client sockets.
	# This will be called in the case where we are trimming idle processes.
	# When idle processes are trimmed, loncnew starts up with no children,
	# and only spawns off children when a connection request occurs on the
	# client unix socket. The spawned child continues to run until it has
	# been idle a while at which point it eventually exits and once more
	# the parent picks up the listen.
	#
	# Parameters:
	# NONE
	# Implicit Inputs:
	# The configuration file that has been read in by LondConnection.
	# Returns:
	# NONE
	#
	sub listen_on_all_unix_sockets {
	Debug(5, "listen_on_all_unix_sockets");
	my $host_iterator = &LondConnection::GetHostIterator();
	while (!$host_iterator->end()) {
	my $host_entry_ref = $host_iterator->get();
	my $host_name = $host_entry_ref->[3];
	Debug(9, "Listen for $host_name");
	&parent_listen($host_name);
	$host_iterator->next();
	}
	}

	# server_died is called whenever a child process exits.
	# Since this is dispatched via a signal, we must process all
	# dead children until there are no more left. The action
	# is to:
	# - Remove the child from the bookeeping hashes
	# - Re-establish a listen on the unix domain socket associated
	# with that host.
	# Parameters:
	# The event, but we don't actually care about it.
	sub server_died {
	&Debug(9, "server_died called...");

	while(1) { # Loop until waitpid nowait fails.
	my $pid = waitpid(-1, WNOHANG);
	if($pid <= 0) {
	return; # Nothing left to wait for.
	}
	# need the host to restart:

	my $host = $ChildHash{$pid};
	if($host) { # It's for real...
	&Debug(9, "Caught sigchild for $host");
	delete($ChildHash{$pid});
	delete($HostToPid{$host});
	&parent_listen($host);

	} else {
	&Debug(5, "Caught sigchild for pid not in hosts hash: $pid");
	}
	}

	}

#	#
# Parent process logic pass 1:	# Parent process logic pass 1:
# For each entry in the hosts table, we will	# For each entry in the hosts table, we will
Line 1607 Log("CRITICAL", "--------------- Startin	Line 1973 Log("CRITICAL", "--------------- Startin

LondConnection::ReadConfig; # Read standard config files.	LondConnection::ReadConfig; # Read standard config files.
my $HostIterator = LondConnection::GetHostIterator;	my $HostIterator = LondConnection::GetHostIterator;
while (! $HostIterator->end()) {

my $hostentryref = $HostIterator->get();	if ($DieWhenIdle) {
CreateChild($hostentryref->[0]);	$RemoteHost = "[parent]";
$HostHash{$hostentryref->[0]} = $hostentryref->[4];	&listen_on_all_unix_sockets();
$HostIterator->next();	} else {

	while (! $HostIterator->end()) {

	my $hostentryref = $HostIterator->get();
	CreateChild($hostentryref->[0]);
	$HostHash{$hostentryref->[0]} = $hostentryref->[4];
	$HostIterator->next();
	}
}	}

$RemoteHost = "Parent Server";	$RemoteHost = "Parent Server";

# Maintain the population:	# Maintain the population:

ShowStatus("Parent keeping the flock");	ShowStatus("Parent keeping the flock");

#
# Set up parent signals:
#

$SIG{INT} = \&Terminate;	if ($DieWhenIdle) {
$SIG{TERM} = \&Terminate;	# We need to setup a SIGChild event to handle the exit (natural or otherwise)
$SIG{HUP} = \&Restart;	# of the children.
$SIG{USR1} = \&CheckKids;
$SIG{USR2} = \&UpdateKids; # LonManage update request.	Event->signal(cb => \&server_died,
	desc => "Child exit handler",
while(1) {	signal => "CHLD");
my $deadchild = wait();
if(exists $ChildHash{$deadchild}) { # need to restart.
my $deadhost = $ChildHash{$deadchild};	# Set up all the other signals we set up. We'll vector them off to the
delete($HostToPid{$deadhost});	# same subs as we would for DieWhenIdle false and, if necessary, conditionalize
delete($ChildHash{$deadchild});	# the code there.
Log("WARNING","Lost child pid= ".$deadchild.
"Connected to host ".$deadhost);	$parent_handlers{INT} = Event->signal(cb => \&Terminate,
Log("INFO", "Restarting child procesing ".$deadhost);	desc => "Parent INT handler",
CreateChild($deadhost);	signal => "INT");
	$parent_handlers{TERM} = Event->signal(cb => \&Terminate,
	desc => "Parent TERM handler",
	signal => "TERM");
	$parent_handlers{HUP} = Event->signal(cb => \&Restart,
	desc => "Parent HUP handler.",
	signal => "HUP");
	$parent_handlers{USR1} = Event->signal(cb => \&CheckKids,
	desc => "Parent USR1 handler",
	signal => "USR1");
	$parent_handlers{USR2} = Event->signal(cb => \&UpdateKids,
	desc => "Parent USR2 handler.",
	signal => "USR2");

	# Start procdesing events.

	$Event::DebugLevel = $DebugLevel;
	Debug(9, "Parent entering event loop");
	my $ret = Event::loop();
	die "Main Event loop exited: $ret";


	} else {
	#
	# Set up parent signals:
	#

	$SIG{INT} = \&Terminate;
	$SIG{TERM} = \&Terminate;
	$SIG{HUP} = \&Restart;
	$SIG{USR1} = \&CheckKids;
	$SIG{USR2} = \&UpdateKids; # LonManage update request.

	while(1) {
	my $deadchild = wait();
	if(exists $ChildHash{$deadchild}) { # need to restart.
	my $deadhost = $ChildHash{$deadchild};
	delete($HostToPid{$deadhost});
	delete($ChildHash{$deadchild});
	Log("WARNING","Lost child pid= ".$deadchild.
	"Connected to host ".$deadhost);
	Log("INFO", "Restarting child procesing ".$deadhost);
	CreateChild($deadhost);
	}
}	}
}	}



=pod	=pod

=head1 CheckKids	=head1 CheckKids
Line 1664 sub CheckKids {	Line 2077 sub CheckKids {
my $now=time;	my $now=time;
my $local=localtime($now);	my $local=localtime($now);
print $fh "LONC status $local - parent $$ \n\n";	print $fh "LONC status $local - parent $$ \n\n";
	foreach my $host (keys %parent_dispatchers) {
	print $fh "LONC Parent process listening for $host\n";
	}
foreach my $pid (keys %ChildHash) {	foreach my $pid (keys %ChildHash) {
Debug(2, "Sending USR1 -> $pid");	Debug(2, "Sending USR1 -> $pid");
kill 'USR1' => $pid; # Tell Child to report status.	kill 'USR1' => $pid; # Tell Child to report status.
sleep 1; # Wait so file doesn't intermix.
}	}

}	}

=pod	=pod
Line 1701 sub UpdateKids {	Line 2117 sub UpdateKids {

Log("INFO", "Updating connections via SIGUSR2");	Log("INFO", "Updating connections via SIGUSR2");

# Just in case we need to kill our own lonc, we wait a few seconds to	# I'm not sure what I was thinking in the first implementation.
# give it a chance to receive and relay lond's response to the	# someone will have to work hard to convince me the effect is any
# re-init command.	# different than Restart, especially now that we don't start up
#	# per host servers automatically, may as well just restart.
	# The down side is transactions that are in flight will get timed out
	# (lost unless they are critical).

sleep(2); # Wait a couple of seconds.	&Restart();

my %hosts; # Indexed by loncapa hostname, value=ip.

# Need to re-read the host table:


LondConnection::ReadConfig();
my $I = LondConnection::GetHostIterator;
while (! $I->end()) {
my $item = $I->get();
$hosts{$item->[0]} = $item->[4];
$I->next();
}

# The logic below is written for clarity not for efficiency.
# Since I anticipate that this function is only rarely called, that's
# appropriate. There are certainly ways to combine the loops below,
# and anyone wishing to obscure the logic is welcome to go for it.
# Note that we don't re-direct sigchild. Instead we do what's needed
# to the data structures that keep track of children to ensure that
# when sigchild is honored, no new child is born.
#

# For each existing child; if it's host doesn't exist, kill the child.

foreach my $child (keys %ChildHash) {
my $oldhost = $ChildHash{$child};
if (!(exists $hosts{$oldhost})) {
Log("CRITICAL", "Killing child for $oldhost host no longer exists");
delete $ChildHash{$child};
delete $HostToPid{$oldhost};
kill 'QUIT' => $child;
}
}
# For each remaining existing child; if it's host's ip has changed,
# Restart the child on the new IP.

foreach my $child (keys %ChildHash) {
my $oldhost = $ChildHash{$child};
my $oldip = $HostHash{$oldhost};
if ($hosts{$oldhost} ne $oldip) {

# kill the old child.

Log("CRITICAL", "Killing child for $oldhost host ip has changed...");
delete $ChildHash{$child};
delete $HostToPid{$oldhost};
kill 'QUIT' => $child;

# Do the book-keeping needed to start a new child on the
# new ip.

$HostHash{$oldhost} = $hosts{$oldhost};
CreateChild($oldhost);
}
}
# Finally, for each new host, not in the host hash, create a
# enter the host and create a new child.
# Force a status display of any existing process.

foreach my $host (keys %hosts) {
if(!(exists $HostHash{$host})) {
Log("INFO", "New host $host discovered in hosts.tab...");
$HostHash{$host} = $hosts{$host};
CreateChild($host);
} else {
kill 'HUP' => $HostToPid{$host}; # status display.
}
}
}	}


Line 1794 sub Restart {	Line 2144 sub Restart {
Log("CRITICAL", "Restarting");	Log("CRITICAL", "Restarting");
my $execdir = $perlvar{'lonDaemons'};	my $execdir = $perlvar{'lonDaemons'};
unlink("$execdir/logs/lonc.pid");	unlink("$execdir/logs/lonc.pid");
exec("$execdir/loncnew");	exec("$executable");
}	}

=pod	=pod
Line 1811 sub KillThemAll {	Line 2161 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 1831 Terminate the system.	Line 2198 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.41
changed lines
	Added in v.1.76