loncom/loncnew - diff

Return to loncnew CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/loncnew between versions 1.6 and 1.10

version 1.6, 2003/05/05 23:40:27	version 1.10, 2003/06/24 02:46:04
Line 34	Line 34
# - Add timer dispatch. (done)	# - Add timer dispatch. (done)
# - Add ability to accept lonc UNIX domain sockets. (done)	# - Add ability to accept lonc UNIX domain sockets. (done)
# - Add ability to create/negotiate lond connections (done).	# - Add ability to create/negotiate lond connections (done).
# - Add general logic for dispatching requests and timeouts.	# - Add general logic for dispatching requests and timeouts. (done).
# - Add support for the lonc/lond requests.	# - Add support for the lonc/lond requests. (done).
# - Add logging/status monitoring.	# - Add logging/status monitoring.
# - Add Signal handling - HUP restarts. USR1 status report.	# - Add Signal handling - HUP restarts. USR1 status report.
# - Add Configuration file I/O	# - Add Configuration file I/O (done).
# - Add Pending request processing on startup.
# - Add management/status request interface.	# - Add management/status request interface.
	# - Add deferred request capability. (done)
	# - Detect transmission timeouts.
	#

	# Change log:
	# $Log$
	# Revision 1.10 2003/06/24 02:46:04 foxr
	# Put a limit on the number of times we'll retry a connection.
	# Start getting the signal stuff put in as well...note that need to get signals
	# going or else 6the client will permanently give up on dead servers.
	#
	# Revision 1.9 2003/06/13 02:38:43 foxr
	# Add logging in 'expected format'
	#
	# Revision 1.8 2003/06/11 02:04:35 foxr
	# Support delayed transactions... this is done uniformly by encapsulating
	# transactions in an object ... a LondTransaction that is implemented by
	# LondTransaction.pm
	#
	# Revision 1.7 2003/06/03 01:59:39 foxr
	# complete coding to support deferred transactions.
	#
	#

use lib "/home/httpd/lib/perl/";	use lib "/home/httpd/lib/perl/";
use lib "/home/foxr/newloncapa/types";	use lib "/home/foxr/newloncapa/types";
Line 49 use POSIX qw(:signal_h);	Line 71 use POSIX qw(:signal_h);
use IO::Socket;	use IO::Socket;
use IO::Socket::INET;	use IO::Socket::INET;
use IO::Socket::UNIX;	use IO::Socket::UNIX;
	use IO::File;
use IO::Handle;	use IO::Handle;
use Socket;	use Socket;
use Crypt::IDEA;	use Crypt::IDEA;
use LONCAPA::Queue;	use LONCAPA::Queue;
use LONCAPA::Stack;	use LONCAPA::Stack;
use LONCAPA::LondConnection;	use LONCAPA::LondConnection;
	use LONCAPA::LondTransaction;
use LONCAPA::Configuration;	use LONCAPA::Configuration;
use LONCAPA::HashIterator;	use LONCAPA::HashIterator;

print "Loncnew starting\n";

#	#
# Disable all signals we might receive from outside for now.	# Disable all signals we might receive from outside for now.
Line 83 my %perlvar = %{$perlvarref};	Line 106 my %perlvar = %{$perlvarref};
my %ChildHash; # by pid -> host.	my %ChildHash; # by pid -> host.


my $MaxConnectionCount = 5; # 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 = 5;	my $DebugLevel = 0;
my $IdleTimeout= 3600; # Wait an hour before pruning connections.	my $IdleTimeout= 3600; # Wait an hour before pruning connections.

#	#
Line 96 my $RemoteHost; # Name of host child i	Line 119 my $RemoteHost; # Name of host child i
my $UnixSocketDir= "/home/httpd/sockets";	my $UnixSocketDir= "/home/httpd/sockets";
my $IdleConnections = Stack->new(); # Set of idle connections	my $IdleConnections = Stack->new(); # Set of idle connections
my %ActiveConnections; # Connections to the remote lond.	my %ActiveConnections; # Connections to the remote lond.
my %ActiveTransactions; # Transactions in flight.	my %ActiveTransactions; # LondTransactions in flight.
my %ActiveClients; # Serial numbers of active clients by socket.	my %ActiveClients; # Serial numbers of active clients by socket.
my $WorkQueue = Queue->new(); # Queue of pending transactions.	my $WorkQueue = Queue->new(); # Queue of pending transactions.
my $ClientQueue = Queue->new(); # Queue of clients causing xactinos.
my $ConnectionCount = 0;	my $ConnectionCount = 0;
my $IdleSeconds = 0; # Number of seconds idle.	my $IdleSeconds = 0; # Number of seconds idle.
	my $Status = ""; # Current status string.
	my $ConnectionRetries=5; # Number of connection retries allowed.
	my $ConnectionRetriesLeft=5; # Number of connection retries remaining.

#	#
# This disconnected socket makes posible a bit more regular	# The hash below gives the HTML format for log messages
# code when processing delayed requests:	# given a severity.
#	#
my $NullSocket = IO::Socket->new();	my %LogFormats;

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



	=pod

	=head2 LogPerm

	Makes an entry into the permanent log file.

	=cut
	sub LogPerm {
	my $message=shift;
	my $execdir=$perlvar{'lonDaemons'};
	my $now=time;
	my $local=localtime($now);
	my $fh=IO::File->new(">>$execdir/logs/lonnet.perm.log");
	print $fh "$now:$message:$local\n";
	}

	=pod

	=head2 Log

	Logs a message to the log file.
	Parameters:

	=item severity

	One of CRITICAL, WARNING, INFO, SUCCESS used to select the
	format string used to format the message. if the severity is
	not a defined severity the Default format string is used.

	=item message

	The base message. In addtion to the format string, the message
	will be appended to a string containing the name of our remote
	host and the time will be formatted into the message.

	=cut

	sub Log {
	my $severity = shift;
	my $message = shift;

	if(!$LogFormats{$severity}) {
	$severity = "DEFAULT";
	}

	my $format = $LogFormats{$severity};

	# Put the window dressing in in front of the message format:

	my $now = time;
	my $local = localtime($now);
	my $finalformat = "$local ($$) [$RemoteHost] [$Status] ";
	my $finalformat = $finalformat.$format."\n";

	# open the file and put the result.

	my $execdir = $perlvar{'lonDaemons'};
	my $fh = IO::File->new(">>$execdir/logs/lonc.log");
	my $msg = sprintf($finalformat, $message);
	print $fh $msg;


	}

#

=pod	=pod

Line 165 sub SocketDump {	Line 261 sub SocketDump {
=head2 ShowStatus	=head2 ShowStatus

Place some text as our pid status.	Place some text as our pid status.
	and as what we return in a SIGUSR1

=cut	=cut
sub ShowStatus {	sub ShowStatus {
my $status = shift;	my $state = shift;
$0 = "lonc: ".$status;	my $now = time;
	my $local = localtime($now);
	$Status = $local.": ".$state;
	$0='lonc: '.$state.' '.$local;
}	}

=pod	=pod
Line 208 sub Tick {	Line 308 sub Tick {
#	#

my $Requests = $WorkQueue->Count();	my $Requests = $WorkQueue->Count();
if (($ConnectionCount == 0) && ($Requests > 0)) {	if (($ConnectionCount == 0) && ($Requests > 0)) {
my $Connections = ($Requests <= $MaxConnectionCount) ?	if ($ConnectionRetriesLeft > 0) {
$Requests : $MaxConnectionCount;	my $Connections = ($Requests <= $MaxConnectionCount) ?
Debug(1,"Work but no connections, starting ".$Connections." of them");	$Requests : $MaxConnectionCount;
for ($i =0; $i < $Connections; $i++) {	Debug(1,"Work but no connections, start ".$Connections." of them");
MakeLondConnection();	for ($i =0; $i < $Connections; $i++) {
	MakeLondConnection();
	}
	} else {
	Debug(1,"Work in queue, but gave up on connections..flushing\n");
	EmptyQueue(); # Connections can't be established.
}	}

}	}
Line 257 long enough, it will be shut down and re	Line 362 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.
	delete($ActiveTransactions{$Socket}); # Server has no transaction

&Debug(6, "Server to idle");	&Debug(6, "Server to idle");

# If there's work to do, start the transaction:	# If there's work to do, start the transaction:

$reqdata = $WorkQueue->dequeue();	$reqdata = $WorkQueue->dequeue(); # This is a LondTransaction
Debug(9, "Queue gave request data: ".$reqdata);
unless($reqdata eq undef) {	unless($reqdata eq undef) {
my $unixSocket = $ClientQueue->dequeue();	Debug(9, "Queue gave request data: ".$reqdata->getRequest());
&Debug(6, "Starting new work request");	&StartRequest($Socket, $reqdata);
&Debug(7, "Request: ".$reqdata);

&StartRequest($Socket, $unixSocket, $reqdata);
} else {	} else {

# There's no work waiting, so push the server to idle list.	# There's no work waiting, so push the server to idle list.
&Debug(8, "No new work requests, server connection going idle");	&Debug(8, "No new work requests, server connection going idle");
delete($ActiveTransactions{$Socket});
$IdleConnections->push($Socket);	$IdleConnections->push($Socket);
}	}
}	}
Line 378 Parameters:	Line 480 Parameters:
Socket on which the lond transaction occured. This is a	Socket on which the lond transaction occured. This is a
LondConnection. The data received is in the TransactionReply member.	LondConnection. The data received is in the TransactionReply member.

=item Client	=item Transaction

Unix domain socket open on the ultimate client.	The transaction that is being completed.

=cut	=cut

sub CompleteTransaction {	sub CompleteTransaction {
&Debug(6,"Complete transaction");	&Debug(6,"Complete transaction");
my $Socket = shift;	my $Socket = shift;
my $Client = shift;	my $Transaction = shift;

my $data = $Socket->GetReply(); # Data to send.	if (!$Transaction->isDeferred()) { # Normal transaction
StartClientReply($Client, $data);	my $data = $Socket->GetReply(); # Data to send.
	StartClientReply($Transaction, $data);
	} else { # Delete deferred transaction file.
	Log("SUCCESS", "A delayed transaction was completed");
	LogPerm("S:$Client:".$Transaction->getRequest());
	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.

	=head2 parameters:

	=item Transaction

	The transaction for which we are responding to the client.

	=item data

	The data to send to apached client.

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

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

&Debug(8," Reply was: ".$data);	&Debug(8," Reply was: ".$data);
my $Serial = $ActiveClients{$Client};	my $Serial = $ActiveClients{$Client};
my $desc = sprintf("Connection to lonc client %d",	my $desc = sprintf("Connection to lonc client %d",
Line 417 sub StartClientReply {	Line 537 sub StartClientReply {
=head2 FailTransaction	=head2 FailTransaction

Finishes a transaction with failure because the associated lond socket	Finishes a transaction with failure because the associated lond socket
disconnected. It is up to our client to retry if desired.	disconnected. There are two possibilities:
	- The transaction is deferred: in which case we just quietly
	delete the transaction since there is no client connection.
	- The transaction is 'live' in which case we initiate the sending
	of "con_lost" to the client.

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

Parameters:	Parameters:

=item client	=item client

The UNIX domain socket open on our client.	The LondTransaction we are failing.

=cut	=cut

sub FailTransaction {	sub FailTransaction {
my $client = shift;	my $transaction = shift;
	Debug(1, "Failing transaction: ".$transaction->getRequest());
StartClientReply($client, "con_lost");	if (!$transaction->isDeferred()) { # If the transaction is deferred we'll get to it.
	my $client = $transcation->getClient();
	Debug(1," Replying con_lost to ".$transaction->getRequest());
	StartClientReply($client, "con_lost\n");
	}

}	}

=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.

=cut	=cut
sub EmptyQueue {	sub EmptyQueue {
while($WorkQueue->Count()) {	while($WorkQueue->Count()) {
my $request = $WorkQUeue->dequeue(); # Just to help it become empty.	my $request = $WorkQueue->dequeue(); # This is a transaction
my $client = $ClientQueue->dequeue(); # Need to con_lost this guy.	FailTransaction($request);
FailTransaction($client);	}
	}

	=pod

	=head2 CloseAllLondConnections

	Close all connections open on lond prior to exit e.g.

	=cut
	sub CloseAllLondConnections {
	foreach $Socket (keys %ActiveConnections) {
	KillSocket($Socket);
}	}
}	}
	=cut

=pod	=pod

Line 471 nonzero if we are allowed to create a ne	Line 618 nonzero if we are allowed to create a ne
sub KillSocket {	sub KillSocket {
my $Socket = shift;	my $Socket = shift;

# If the socket came from the active connection set, delete it.	$Socket->Shutdown();
# otherwise it came from the idle set and has already been destroyed:
	# If the socket came from the active connection set,
	# delete its transaction... note that FailTransaction should
	# already have been called!!!
	# otherwise it came from the idle set.
	#

if(exists($ActiveTransactions{$Socket})) {	if(exists($ActiveTransactions{$Socket})) {
delete ($ActiveTransactions{$Socket});	delete ($ActiveTransactions{$Socket});
Line 549 transaction is in progress, the socket a	Line 701 transaction is in progress, the socket a
=cut	=cut

sub LondReadable {	sub LondReadable {

my $Event = shift;	my $Event = shift;
my $Watcher = $Event->w;	my $Watcher = $Event->w;
my $Socket = $Watcher->data;	my $Socket = $Watcher->data;
my $client = undef;	my $client = undef;

	&Debug(6,"LondReadable called state = ".$State);


my $State = $Socket->GetState(); # All action depends on the state.	my $State = $Socket->GetState(); # All action depends on the state.

&Debug(6,"LondReadable called state = ".$State);
SocketDump(6, $Socket);	SocketDump(6, $Socket);

if($Socket->Readable() != 0) {	if($Socket->Readable() != 0) {
Line 585 sub LondReadable {	Line 739 sub LondReadable {
# 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->poll("w");
$Watcher->cb(\&LondWritable);	$Watcher->cb(\&LondWritable);
	$Watcher->poll("w");

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

Line 595 sub LondReadable {	Line 749 sub LondReadable {
# The ok was received. Now we need to request the key	# The ok was received. Now we need to request the key
# That requires us to be writable:	# That requires us to be writable:

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

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

} elsif ($State eq "Idle") {	} elsif ($State eq "Idle") {
# If necessary, complete a transaction and then go into the	# If necessary, complete a transaction and then go into the
# idle queue.	# idle queue.
	$Watcher->cancel();
if(exists($ActiveTransactions{$Socket})) {	if(exists($ActiveTransactions{$Socket})) {
Debug(8,"Completing transaction!!");	Debug(8,"Completing transaction!!");
CompleteTransaction($Socket,	CompleteTransaction($Socket,
$ActiveTransactions{$Socket});	$ActiveTransactions{$Socket});
	} else {
	Log("SUCCESS", "Connection ".$ConnectionCount." to "
	.$RemoteHost." now ready for action");
}	}
$Watcher->cancel();
ServerToIdle($Socket); # Next work unit or idle.	ServerToIdle($Socket); # Next work unit or idle.

} elsif ($State eq "SendingRequest") {	} elsif ($State eq "SendingRequest") {
Line 692 is the socket on which to return a reply	Line 849 is the socket on which to return a reply
sub LondWritable {	sub LondWritable {
my $Event = shift;	my $Event = shift;
my $Watcher = $Event->w;	my $Watcher = $Event->w;
my @data = $Watcher->data;	my $Socket = $Watcher->data;
Debug(6,"LondWritable State = ".$State." data has ".@data." elts.\n");	my $State = $Socket->GetState();

my $Socket = $data[0]; # I know there's at least a socket.	Debug(6,"LondWritable State = ".$State."\n");


# Figure out what to do depending on the state of the socket:	# Figure out what to do depending on the state of the socket:


my $State = $Socket->GetState();


SocketDump(6,$Socket);	SocketDump(6,$Socket);
Line 710 sub LondWritable {	Line 867 sub LondWritable {
if ($Socket->Writable() != 0) {	if ($Socket->Writable() != 0) {
# The write resulted in an error.	# The write resulted in an error.
# We'll treat this as if the socket got disconnected:	# We'll treat this as if the socket got disconnected:
	Log("WARNING", "Connection to ".$RemoteHost.
	" has been disconnected");
$Watcher->cancel();	$Watcher->cancel();
KillSocket($Socket);	KillSocket($Socket);
return;	return;
Line 723 sub LondWritable {	Line 881 sub LondWritable {
# Now that init was sent, we switch	# Now that init was sent, we switch
# to watching for readability:	# to watching for readability:

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

} elsif ($State eq "ChallengeReceived") {	} elsif ($State eq "ChallengeReceived") {
# We received the challenge, now we	# We received the challenge, now we
Line 742 sub LondWritable {	Line 900 sub LondWritable {
# The echo was sent back, so we switch	# The echo was sent back, so we switch
# to watching readability.	# to watching readability.

$Watcher->poll("r");
$Watcher->cb(\&LondReadable);	$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.
Line 763 sub LondWritable {	Line 921 sub LondWritable {
# 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:

$Watcher->poll("r");
$Watcher->cb(\&LondReadable);	$Watcher->cb(\&LondReadable);
	$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
Line 786 sub LondWritable {	Line 944 sub LondWritable {
# The send has completed. Wait for the	# The send has completed. Wait for the
# data to come in for a reply.	# data to come in for a reply.
Debug(8,"Writable sent request/receiving reply");	Debug(8,"Writable sent request/receiving reply");
$Watcher->poll("r");
$Watcher->cb(\&LondReadable);	$Watcher->cb(\&LondReadable);
	$Watcher->poll("r");

} else {	} else {
# Control only passes here on an error:	# Control only passes here on an error:
Line 803 sub LondWritable {	Line 961 sub LondWritable {

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

my $path = "$perlvar{'lonSockDir'}/delayed";	my $path = "$perlvar{'lonSockDir'}/delayed";

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

@alldelayed = grep /\.$RemoteHost$/, readdir DIRHANDLE;	@alldelayed = grep /\.$RemoteHost$/, readdir DIRHANDLE;
	Debug(4, "Got ".$alldelayed." delayed files");
closedir(DIRHANDLE);	closedir(DIRHANDLE);
my $dfname;	my $dfname;
my $reqfile	my $reqfile;
foreach $reqfile (sort @alldelayed) {	foreach $dfname (sort @alldelayed) {
$reqfile = $path/$reqfile;	$reqfile = "$path/$dfname";
	Debug(4, "queueing ".$reqfile);
my $Handle = IO::File->new($reqfile);	my $Handle = IO::File->new($reqfile);
my $cmd = <$Handle>;	my $cmd = <$Handle>;
chomp($cmd);	chomp $cmd; # There may or may not be a newline...
QueueTransaction($NullSocket, $cmd);	$cmd = $cmd."\ny"; # now for sure there's exactly one newline.
	my $Transaction = LondTransaction->new($cmd);
	$Transaction->SetDeferred($reqfile);
	QueueTransaction($Transaction);
}	}

}	}
Line 839 sub MakeLondConnection {	Line 1007 sub MakeLondConnection {
&GetServerPort());	&GetServerPort());

if($Connection == undef) { # Needs to be more robust later.	if($Connection == undef) { # Needs to be more robust later.
Debug(0,"Failed to make a connection with lond.");	Log("CRITICAL","Failed to make a connection with lond.");
	$ConnectionRetriesLeft--;
	return 0; # Failure.
} else {	} else {
	$ConnectionRetriesLeft = $ConnectionRetries; # success resets the count
# The connection needs to have writability	# The connection needs to have writability
# monitored in order to send the init sequence	# monitored in order to send the init sequence
# that starts the whole authentication/key	# that starts the whole authentication/key
Line 857 sub MakeLondConnection {	Line 1028 sub MakeLondConnection {
$event = Event->io(fd => $Socket,	$event = Event->io(fd => $Socket,
poll => 'w',	poll => 'w',
cb => \&LondWritable,	cb => \&LondWritable,
data => ($Connection, undef),	data => $Connection,
desc => 'Connection to lond server');	desc => 'Connection to lond server');
$ActiveConnections{$Connection} = $event;	$ActiveConnections{$Connection} = $event;

$ConnectionCount++;	$ConnectionCount++;
	Debug(4, "Connection count = ".$ConnectionCount);
if($ConnectionCount == 1) { # First Connection:	if($ConnectionCount == 1) { # First Connection:
QueueDelayed;	QueueDelayed;
}	}
	Log("SUCESS", "Created connection ".$ConnectionCount
	." to host ".GetServerHost());
	return 1; # Return success.
}	}

}	}
Line 896 The text of the request to send.	Line 1071 The text of the request to send.

sub StartRequest {	sub StartRequest {
my $Lond = shift;	my $Lond = shift;
my $Client = shift;	my $Request = shift; # This is a LondTransaction.
my $Request = shift;

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

my $Socket = $Lond->GetSocket();	my $Socket = $Lond->GetSocket();

$ActiveTransactions{$Lond} = $Client; # Socket to relay to client.	$Request->Activate($Lond);
	$ActiveTransactions{$Lond} = $Request;

$Lond->InitiateTransaction($Request);	$Lond->InitiateTransaction($Request->getRequest());
$event = Event->io(fd => $Lond->GetSocket(),	$event = Event->io(fd => $Socket,
poll => "w",	poll => "w",
cb => \&LondWritable,	cb => \&LondWritable,
data => $Lond,	data => $Lond,
Line 937 data to send to the lond.	Line 1112 data to send to the lond.
=cut	=cut

sub QueueTransaction {	sub QueueTransaction {
my $requestSocket = shift;
my $requestData = shift;

Debug(6,"QueueTransaction: ".$requestData);	my $requestData = shift; # This is a LondTransaction.
	my $cmd = $requestData->getRequest();

	Debug(6,"QueueTransaction: ".$cmd);

my $LondSocket = $IdleConnections->pop();	my $LondSocket = $IdleConnections->pop();
if(!defined $LondSocket) { # Need to queue request.	if(!defined $LondSocket) { # Need to queue request.
Debug(8,"Must queue...");	Debug(8,"Must queue...");
$ClientQueue->enqueue($requestSocket);
$WorkQueue->enqueue($requestData);	$WorkQueue->enqueue($requestData);
if($ConnectionCount < $MaxConnectionCount) {	if($ConnectionCount < $MaxConnectionCount) {
Debug(4,"Starting additional lond connection");	Debug(4,"Starting additional lond connection");
Line 953 sub QueueTransaction {	Line 1128 sub QueueTransaction {
}	}
} else { # Can start the request:	} else { # Can start the request:
Debug(8,"Can start...");	Debug(8,"Can start...");
StartRequest($LondSocket, $requestSocket, $requestData);	StartRequest($LondSocket, $requestData);
}	}
}	}

Line 962 sub QueueTransaction {	Line 1137 sub QueueTransaction {
=pod	=pod

=head2 ClientRequest	=head2 ClientRequest

Callback that is called when data can be read from the UNIX domain	Callback that is called when data can be read from the UNIX domain
socket connecting us with an apache server process.	socket connecting us with an apache server process.

Line 987 sub ClientRequest {	Line 1161 sub ClientRequest {
close($socket);	close($socket);
$watcher->cancel();	$watcher->cancel();
delete($ActiveClients{$socket});	delete($ActiveClients{$socket});
	return;
}	}
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") {
	Log("CRITICAL",
	"Request Close Connection ... exiting");
	CloseAllLondConnections();
	exit;
	}
Debug(8, "Complete transaction received: ".$data);	Debug(8, "Complete transaction received: ".$data);
QueueTransaction($socket, $data);	my $Transaction = LondTransaction->new($data);
	$Transaction->SetClient($socket);
	QueueTransaction($Transaction);
$watcher->cancel(); # Done looking for input data.	$watcher->cancel(); # Done looking for input data.
}	}

Line 1055 Returns the host whose lond we talk with	Line 1238 Returns the host whose lond we talk with

=cut	=cut

sub GetServerHost { # Stub - get this from config.	sub GetServerHost {
return $RemoteHost; # Setup by the fork.	return $RemoteHost; # Setup by the fork.
}	}

Line 1067 Returns the lond port number.	Line 1250 Returns the lond port number.

=cut	=cut

sub GetServerPort { # Stub - get this from config.	sub GetServerPort {
return $perlvar{londPort};	return $perlvar{londPort};
}	}

Line 1088 sub SetupLoncListener {	Line 1271 sub SetupLoncListener {
my $socket;	my $socket;
my $SocketName = GetLoncSocketPath();	my $SocketName = GetLoncSocketPath();
unlink($SocketName);	unlink($SocketName);
unless ($socket = IO::Socket::UNIX->new(Local => $SocketName,	unless ($socket =IO::Socket::UNIX->new(Local => $SocketName,
Listen => 10,	Listen => 10,
Type => SOCK_STREAM)) {	Type => SOCK_STREAM)) {
die "Failed to create a lonc listner socket";	die "Failed to create a lonc listner socket";
Line 1101 sub SetupLoncListener {	Line 1284 sub SetupLoncListener {

=pod	=pod

	=head2 SignalledToDeath

	Called in response to a signal that causes a chid process to die.

	=cut

	=pod

	sub SignalledToDeath {
	my ($signal) = @_;
	chomp($signal);
	Log("CRITICAL", "Abnormal exit. Child $$ for $RemoteHost "
	."died through "."\"$signal\"");
	LogPerm("F:lonc: $$ on $RemoteHost signalled to death: "
	."\"$signal\"");
	die("Signal abnormal end");

	}
=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.
Line 1109 This sub implements a child process for	Line 1310 This sub implements a child process for

sub ChildProcess {	sub ChildProcess {

print "Loncnew\n";

# For now turn off signals.	# For now turn off signals.

$SIG{QUIT} = IGNORE;	$SIG{QUIT} = \&SignalledToDeath;
$SIG{HUP} = IGNORE;	$SIG{HUP} = IGNORE;
$SIG{USR1} = IGNORE;	$SIG{USR1} = IGNORE;
$SIG{INT} = IGNORE;	$SIG{INT} = IGNORE;
$SIG{CHLD} = IGNORE;	$SIG{CHLD} = IGNORE;
$SIG{__DIE__} = IGNORE;	$SIG{__DIE__} = \&SignalledToDeath;

SetupTimer();	SetupTimer();

Line 1130 sub ChildProcess {	Line 1330 sub ChildProcess {

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

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


if($ConnectionCount == 0) {
Debug(1,"Could not make initial connection..\n");
Debug(1,"Will retry when there's work to do\n");
}
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.

Line 1148 sub ChildProcess {	Line 1345 sub ChildProcess {
sub CreateChild {	sub CreateChild {
my $host = shift;	my $host = shift;
$RemoteHost = $host;	$RemoteHost = $host;
Debug(3, "Forking off child for ".$RemoteHost);	Log("CRITICAL", "Forking server for ".$host);
sleep(5);
$pid = fork;	$pid = fork;
if($pid) { # Parent	if($pid) { # Parent
$ChildHash{$pid} = $RemoteHost;	$ChildHash{$pid} = $RemoteHost;
Line 1177 sub CreateChild {	Line 1373 sub CreateChild {



ShowStatus("Parent writing pid file:");
$execdir = $perlvar{'lonDaemons'};
open (PIDSAVE, ">$execdir/logs/lonc.pid");
print PIDSAVE "$$\n";
close(PIDSAVE);

ShowStatus("Forming new session");	ShowStatus("Forming new session");
my $childpid = fork;	my $childpid = fork;
Line 1189 if ($childpid != 0) {	Line 1381 if ($childpid != 0) {
sleep 4; # Give child a chacne to break to	sleep 4; # Give child a chacne to break to
exit 0; # a new sesion.	exit 0; # a new sesion.
}	}
	#
	# Write my pid into the pid file so I can be located
	#

	ShowStatus("Parent writing pid file:");
	$execdir = $perlvar{'lonDaemons'};
	open (PIDSAVE, ">$execdir/logs/lonc.pid");
	print PIDSAVE "$$\n";
	close(PIDSAVE);

if (POSIX::setsid() < 0) {	if (POSIX::setsid() < 0) {
print "Could not create new session\n";	print "Could not create new session\n";
Line 1197 if (POSIX::setsid() < 0) {	Line 1398 if (POSIX::setsid() < 0) {

ShowStatus("Forking node servers");	ShowStatus("Forking node servers");

	Log("CRITICAL", "--------------- Starting children ---------------");

my $HostIterator = LondConnection::GetHostIterator;	my $HostIterator = LondConnection::GetHostIterator;
while (! $HostIterator->end()) {	while (! $HostIterator->end()) {

Line 1209 while (! $HostIterator->end()) {	Line 1412 while (! $HostIterator->end()) {

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

	#
	# Set up parent signals:
	#
	$SIG{INT} = &KillThemAll;
	$SIG{TERM} = &KillThemAll;

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

=head1 Theory	=head1 Theory

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

Removed from v.1.6
changed lines
	Added in v.1.10