loncom/loncnew - diff

Return to loncnew CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/loncnew between versions 1.7 and 1.14

version 1.7, 2003/06/03 01:59:39	version 1.14, 2003/07/03 02:10:18
Line 39	Line 39
# - 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 (done).	# - 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.	# - Add deferred request capability. (done)
	# - Detect transmission timeouts.
#	#

# Change log:	# Change log:
# $Log$	# $Log$
	# Revision 1.14 2003/07/03 02:10:18 foxr
	# Get all of the signals to work correctly.
	#
	# Revision 1.13 2003/07/02 01:31:55 foxr
	# Added kill -HUP logic (restart).
	#
	# Revision 1.11 2003/06/25 01:54:44 foxr
	# Fix more problems with transaction failure.
	#
	# 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	# Revision 1.7 2003/06/03 01:59:39 foxr
# complete coding to support deferred transactions.	# complete coding to support deferred transactions.
#	#
Line 55 use lib "/home/httpd/lib/perl/";	Line 77 use lib "/home/httpd/lib/perl/";
use lib "/home/foxr/newloncapa/types";	use lib "/home/foxr/newloncapa/types";
use Event qw(:DEFAULT );	use Event qw(:DEFAULT );
use POSIX qw(:signal_h);	use POSIX qw(:signal_h);
	use POSIX;
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;
Line 68 use LONCAPA::LondTransaction;	Line 92 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.
#	#
$SIG{QUIT} = IGNORE;	#$SIG{QUIT} = IGNORE;
$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__} = IGNORE;


# Read the httpd configuration file to get perl variables	# Read the httpd configuration file to get perl variables
Line 93 my %perlvar = %{$perlvarref};	Line 116 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 109 my %ActiveConnections; # Connections to	Line 132 my %ActiveConnections; # Connections to
my %ActiveTransactions; # LondTransactions 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 $RecentLogEntry = "";
	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);
	$RecentLogEntry = $msg;
	print $fh $msg;


	}

#

=pod	=pod

Line 175 sub SocketDump {	Line 273 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 194 Invoked each timer tick.	Line 296 Invoked each timer tick.
sub Tick {	sub Tick {
my $client;	my $client;
ShowStatus(GetServerHost()." Connection count: ".$ConnectionCount);	ShowStatus(GetServerHost()." Connection count: ".$ConnectionCount);
Debug(6, "Tick");
Debug(6, " Current connection count: ".$ConnectionCount);
foreach $client (keys %ActiveClients) {
Debug(7, " Have client: with id: ".$ActiveClients{$client});
}
# Is it time to prune connection count:	# Is it time to prune connection count:


Line 218 sub Tick {	Line 316 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 277 sub ServerToIdle {	Line 380 sub ServerToIdle {
unless($reqdata eq undef) {	unless($reqdata eq undef) {
Debug(9, "Queue gave request data: ".$reqdata->getRequest());	Debug(9, "Queue gave request data: ".$reqdata->getRequest());
&StartRequest($Socket, $reqdata);	&StartRequest($Socket, $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.
Line 399 sub CompleteTransaction {	Line 503 sub CompleteTransaction {
my $data = $Socket->GetReply(); # Data to send.	my $data = $Socket->GetReply(); # Data to send.
StartClientReply($Transaction, $data);	StartClientReply($Transaction, $data);
} else { # Delete deferred transaction file.	} else { # Delete deferred transaction file.
	Log("SUCCESS", "A delayed transaction was completed");
	LogPerm("S:$Client:".$Transaction->getRequest());
unlink $Transaction->getFile();	unlink $Transaction->getFile();
}	}
}	}
Line 422 sub StartClientReply {	Line 528 sub StartClientReply {
my $Transaction = shift;	my $Transaction = shift;
my $data = shift;	my $data = shift;


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

&Debug(8," Reply was: ".$data);	&Debug(8," Reply was: ".$data);
Line 458 Parameters:	Line 565 Parameters:

sub FailTransaction {	sub FailTransaction {
my $transaction = shift;	my $transaction = shift;
my $Lond = $transaction->getServer();	Debug(1, "Failing transaction: ".$transaction->getRequest());
if (!$client->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 = $transcation->getClient();	my $client = $transaction->getClient();
StartClientReply($client, "con_lost");	Debug(1," Replying con_lost to ".$transaction->getRequest());
	StartClientReply($transaction, "con_lost\n");
}	}
# not needed, done elsewhere if active.
# delete $ActiveTransactions{$Lond};

}	}

Line 477 sub FailTransaction {	Line 583 sub FailTransaction {
=cut	=cut
sub EmptyQueue {	sub EmptyQueue {
while($WorkQueue->Count()) {	while($WorkQueue->Count()) {
my $request = $Workqueue->dequeue(); # This is a transaction	my $request = $WorkQueue->dequeue(); # This is a transaction
FailTransaction($request);	FailTransaction($request);
}	}
}	}

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

=head2 KillSocket	=head2 KillSocket

Destroys a socket. This function can be called either when a socket	Destroys a socket. This function can be called either when a socket
Line 507 nonzero if we are allowed to create a ne	Line 627 nonzero if we are allowed to create a ne
sub KillSocket {	sub KillSocket {
my $Socket = shift;	my $Socket = shift;

	$Socket->Shutdown();

# If the socket came from the active connection set,	# If the socket came from the active connection set,
# delete its transaction... note that FailTransaction should	# delete its transaction... note that FailTransaction should
# already have been called!!!	# already have been called!!!
Line 588 transaction is in progress, the socket a	Line 710 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);
	my $status = $Socket->Readable();
	&Debug(2, "Socket->Readable returned: $status");

if($Socket->Readable() != 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.

Line 624 sub LondReadable {	Line 750 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 634 sub LondReadable {	Line 760 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 731 is the socket on which to return a reply	Line 860 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; # 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 749 sub LondWritable {	Line 878 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 762 sub LondWritable {	Line 892 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 781 sub LondWritable {	Line 911 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 802 sub LondWritable {	Line 932 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 825 sub LondWritable {	Line 955 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 842 sub LondWritable {	Line 972 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...
	$cmd = $cmd."\n"; # now for sure there's exactly one newline.
my $Transaction = LondTransaction->new($cmd);	my $Transaction = LondTransaction->new($cmd);
$Transaction->SetDeferred($reqfile);	$Transaction->SetDeferred($reqfile);
QueueTransaction($Transaction);	QueueTransaction($Transaction);
Line 880 sub MakeLondConnection {	Line 1018 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 898 sub MakeLondConnection {	Line 1039 sub MakeLondConnection {
$event = Event->io(fd => $Socket,	$event = Event->io(fd => $Socket,
poll => 'w',	poll => 'w',
cb => \&LondWritable,	cb => \&LondWritable,
data => \$Connection,	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 947 sub StartRequest {	Line 1092 sub StartRequest {
$ActiveTransactions{$Lond} = $Request;	$ActiveTransactions{$Lond} = $Request;

$Lond->InitiateTransaction($Request->getRequest());	$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 1003 sub QueueTransaction {	Line 1148 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 1028 sub ClientRequest {	Line 1172 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);
my $Transaction = new LondTransaction->new($data);	my $Transaction = LondTransaction->new($data);
$Transaction->SetClient($socket);	$Transaction->SetClient($socket);
QueueTransaction($Transaction);	QueueTransaction($Transaction);
$watcher->cancel(); # Done looking for input data.	$watcher->cancel(); # Done looking for input data.
Line 1142 sub SetupLoncListener {	Line 1293 sub SetupLoncListener {
fd => $socket);	fd => $socket);
}	}

	=pod

	=head2 ChildStatus

	Child USR1 signal handler to report the most recent status
	into the status file.

	=cut
	sub ChildStatus {
	my $event = shift;
	my $watcher = $event->w;

	Debug(2, "Reporting child status because : ".$watcher->data);
	my $docdir = $perlvar{'lonDocRoot'};
	my $fh = IO::File->new(">>$docdir/lon-status/loncstatus.txt");
	print $fh $$."\t".$RemoteHost."\t".$Status."\t".
	$RecentLogEntry."\n";
	}

=pod	=pod

	=head2 SignalledToDeath

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

	=cut


	sub SignalledToDeath {
	my $event = shift;
	my $watcher= $event->w;

	Debug(2,"Signalled to death! via ".$watcher->data);
	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");
	exit 0;

	}
=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 1152 This sub implements a child process for	Line 1344 This sub implements a child process for

sub ChildProcess {	sub ChildProcess {

print "Loncnew\n";

# For now turn off signals.	#
	# Signals must be handled by the Event framework...
$SIG{QUIT} = IGNORE;	#
$SIG{HUP} = IGNORE;	# $SIG{QUIT} = \&SignalledToDeath;
$SIG{USR1} = IGNORE;	# $SIG{HUP} = \&ChildStatus;
$SIG{INT} = IGNORE;	# $SIG{USR1} = IGNORE;
$SIG{CHLD} = IGNORE;	# $SIG{INT} = DEFAULT;
$SIG{__DIE__} = IGNORE;	# $SIG{CHLD} = IGNORE;
	# $SIG{__DIE__} = \&SignalledToDeath;

	Event->signal(signal => "QUIT",
	cb => \&SignalledToDeath,
	data => "QUIT");
	Event->signal(signal => "HUP",
	cb => \&ChildStatus,
	data => "HUP");
	Event->signal(signal => "USR1",
	cb => \&ChildStatus,
	data => "USR1");

SetupTimer();	SetupTimer();

Line 1173 sub ChildProcess {	Line 1375 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 1189 sub ChildProcess {	Line 1388 sub ChildProcess {
# Create a new child for host passed in:	# Create a new child for host passed in:

sub CreateChild {	sub CreateChild {
	my $sigset = POSIX::SigSet->new(SIGINT);
	sigprocmask(SIG_BLOCK, $sigset);
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;
	sigprocmask(SIG_UNBLOCK, $sigset);

} else { # child.	} else { # child.
ShowStatus("Connected to ".$RemoteHost);	ShowStatus("Connected to ".$RemoteHost);
ChildProcess;	$SIG{INT} = DEFAULT;
	sigprocmask(SIG_UNBLOCK, $sigset);
	ChildProcess; # Does not return.
}	}

}	}
Line 1220 sub CreateChild {	Line 1424 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 1232 if ($childpid != 0) {	Line 1432 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 1240 if (POSIX::setsid() < 0) {	Line 1449 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 1247 while (! $HostIterator->end()) {	Line 1458 while (! $HostIterator->end()) {
CreateChild($hostentryref->[0]);	CreateChild($hostentryref->[0]);
$HostIterator->next();	$HostIterator->next();
}	}
	$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;
	$SIG{TERM} = \&Terminate;
	$SIG{HUP} = \&Restart;
	$SIG{USR1} = \&CheckKids;

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);
}	}
}	}



	=pod

	=head1 CheckKids

	Since kids do not die as easily in this implementation
	as the previous one, there is no need to restart the
	dead ones (all dead kids get restarted when they die!!)
	The only thing this function does is to pass USR1 to the
	kids so that they report their status.

	=cut

	sub CheckKids {
	Debug(2, "Checking status of children");
	my $docdir = $perlvar{'lonDocRoot'};
	my $fh = IO::File->new(">$docdir/lon-status/loncstatus.txt");
	my $now=time;
	my $local=localtime($now);
	print $fh "LONC status $local - parent $$ \n\n";
	foreach $pid (keys %ChildHash) {
	Debug(2, "Sending USR1 -> $pid");
	kill 'USR1' => $pid; # Tell Child to report status.
	sleep 1; # Wait so file doesn't intermix.
	}
	}

	=pod

	=head1 Restart

	Signal handler for HUP... all children are killed and
	we self restart. This is an el-cheapo way to re read
	the config file.

	=cut

	sub Restart {
	KillThemAll; # First kill all the children.
	Log("CRITICAL", "Restarting");
	my $execdir = $perlvar{'lonDaemons'};
	unlink("$execdir/logs/lonc.pid");
	exec("$execdir/lonc");
	}

	=pod

	=head1 KillThemAll

	Signal handler that kills all children by sending them a
	SIGINT. Responds to sigint and sigterm.

	=cut

	sub KillThemAll {
	Debug(2, "Kill them all!!");
	local($SIG{CHLD}) = 'IGNORE'; # Our children >will< die.
	foreach $pid (keys %ChildHash) {
	my $serving = $ChildHash{$pid};
	Debug(2, "Killing lonc for $serving pid = $pid");
	ShowStatus("Killing lonc for $serving pid = $pid");
	Log("CRITICAL", "Killing lonc for $serving pid = $pid");
	kill('INT', $pid);
	delete($ChildeHash{$pid});
	}
	my $execdir = $perlvar{'lonDaemons'};
	unlink("$execdir/logs/lonc.pid");
	ShowStatus("Killing the master process");
	Log("CRITICAL", "Killing the master process.");
	}

	=pod

	=head1 Terminate

	Terminate the system.

	=cut

	sub Terminate {
	KillThemAll;
	exit;

	}
	=pod

=head1 Theory	=head1 Theory

The event class is used to build this as a single process with an	The event class is used to build this as a single process with an

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

Removed from v.1.7
changed lines
	Added in v.1.14