loncom/loncnew - diff

Return to loncnew CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/loncnew between versions 1.56 and 1.60

version 1.56, 2004/09/21 10:54:43	version 1.60, 2004/09/22 11:11:54
Line 106 my $LondVersion = "unknown"; # Versi	Line 106 my $LondVersion = "unknown"; # Versi
my $KeyMode = ""; # e.g. ssl, local, insecure from last connect.	my $KeyMode = ""; # e.g. ssl, local, insecure from last connect.
my $LondConnecting = 0; # True when a connection is being built.	my $LondConnecting = 0; # True when a connection is being built.


	# DO NOT SET THE NEXT VARIABLE TO NON ZERO!!!!!!!!!!!!!!!

	my $DieWhenIdle = 0; # When true children die when trimmed -> 0.

#	#
# The hash below gives the HTML format for log messages	# The hash below gives the HTML format for log messages
# given a severity.	# given a severity.
Line 119 $LogFormats{"WARNING"} = "<font color='	Line 124 $LogFormats{"WARNING"} = "<font color='
$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 296 sub Tick {	Line 315 sub Tick {
my $clock_watcher = $Event->w;	my $clock_watcher = $Event->w;

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


Line 313 sub Tick {	Line 327 sub Tick {
my $Socket = $IdleConnections->pop();	my $Socket = $IdleConnections->pop();
KillSocket($Socket);	KillSocket($Socket);
$IdleSeconds = 0; # Otherwise all connections get trimmed to fast.	$IdleSeconds = 0; # Otherwise all connections get trimmed to fast.
	UpdateStatus();
	if(($ConnectionCount == 0) && $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);
	}
}	}
} else {	} else {
$IdleSeconds = 0; # Reset idle count if not idle.	$IdleSeconds = 0; # Reset idle count if not idle.
Line 331 sub Tick {	Line 360 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) && (!$LondConnecting)) {	if (($ConnectionCount == 0) && ($Requests > 0) && (!$LondConnecting)) {
if ($ConnectionRetriesLeft > 0) {	if ($ConnectionRetriesLeft > 0) {
Line 1368 sub NewClient {	Line 1398 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 1408 connection. The event handler establish	Line 1448 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 => 250,	Listen => 250,
Type => SOCK_STREAM)) {	Type => SOCK_STREAM)) {
die "Failed to create a lonc listner socket";	die "Failed to create a lonc listner socket";
}	}
Event->io(cb => \&NewClient,	return $socket;
poll => 'r',
desc => 'Lonc listener Unix Socket',
fd => $socket);
}	}

#	#
Line 1551 sub ChildProcess {	Line 1597 sub ChildProcess {
data => "INT");	data => "INT");


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

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

Line 1642 Log("CRITICAL", "--------------- Startin	Line 1692 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]);	print "Die when idle socket monitoring is not yet implemented\n";
$HostHash{$hostentryref->[0]} = $hostentryref->[4];	exit(-1);
$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:
Line 1659 ShowStatus("Parent keeping the flock");	Line 1717 ShowStatus("Parent keeping the flock");
# Set up parent signals:	# Set up parent signals:
#	#

$SIG{INT} = \&Terminate;	if ($DieWhenIdle) {
$SIG{TERM} = \&Terminate;	print "Die when idle main processing not yet implemented";
$SIG{HUP} = \&Restart;	exit (-1);
$SIG{USR1} = \&CheckKids;	} else {
$SIG{USR2} = \&UpdateKids; # LonManage update request.
	$SIG{INT} = \&Terminate;
while(1) {	$SIG{TERM} = \&Terminate;
my $deadchild = wait();	$SIG{HUP} = \&Restart;
if(exists $ChildHash{$deadchild}) { # need to restart.	$SIG{USR1} = \&CheckKids;
my $deadhost = $ChildHash{$deadchild};	$SIG{USR2} = \&UpdateKids; # LonManage update request.
delete($HostToPid{$deadhost});
delete($ChildHash{$deadchild});	while(1) {
Log("WARNING","Lost child pid= ".$deadchild.	my $deadchild = wait();
"Connected to host ".$deadhost);	if(exists $ChildHash{$deadchild}) { # need to restart.
Log("INFO", "Restarting child procesing ".$deadhost);	my $deadhost = $ChildHash{$deadchild};
CreateChild($deadhost);	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

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

Removed from v.1.56
changed lines
	Added in v.1.60