loncom/loncnew - diff

Return to loncnew CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/loncnew between versions 1.65 and 1.67

version 1.65, 2004/10/05 11:16:57	version 1.67, 2005/01/17 22:18:44
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 419 sub Tick {	Line 420 sub Tick {
$KeyMode = "";	$KeyMode = "";
$clock_watcher->cancel();	$clock_watcher->cancel();
}	}
	&UpdateStatus();
}	}

=pod	=pod
Line 1565 sub ChildStatus {	Line 1567 sub ChildStatus {

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:
#	#
if ($DebugLevel > 2) {	if ($DebugLevel > 2) {
print $fh "Active connection statuses: \n";	print LOG "Active connection statuses: \n";
my $i = 1;	my $i = 1;
print STDERR "================================= Socket Status Dump:\n";	print STDERR "================================= Socket Status Dump:\n";
foreach my $item (keys %ActiveConnections) {	foreach my $item (keys %ActiveConnections) {
my $Socket = $ActiveConnections{$item}->data;	my $Socket = $ActiveConnections{$item}->data;
my $state = $Socket->GetState();	my $state = $Socket->GetState();
print $fh "Connection $i State: $state\n";	print LOG "Connection $i State: $state\n";
print STDERR "---------------------- Connection $i \n";	print STDERR "---------------------- Connection $i \n";
$Socket->Dump(-1); # Ensure it gets dumped..	$Socket->Dump(-1); # Ensure it gets dumped..
$i++;	$i++;
}	}
}	}
	flock(LOG,LOCK_UN);
	close(LOG);
$ConnectionRetriesLeft = $ConnectionRetries;	$ConnectionRetriesLeft = $ConnectionRetries;
}	}

Line 2056 sub CheckKids {	Line 2062 sub CheckKids {
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.
}	}

}	}

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

Removed from v.1.65
changed lines
	Added in v.1.67