--- loncom/loncnew	2004/03/02 16:25:17	1.44
+++ loncom/loncnew	2004/06/01 10:02:13	1.47
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.44 2004/03/02 16:25:17 albertel Exp $
+# $Id: loncnew,v 1.47 2004/06/01 10:02:13 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,10 +110,10 @@ my $LondVersion     = "unknown"; # Versi
 #    
 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{"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 ";
 
 
@@ -156,9 +156,9 @@ host and the time will be formatted into
 =cut
 
 sub Log {
-    my $severity = shift;
-    my $message  = shift;
-   
+
+    my ($severity, $message) = @_;
+
     if(!$LogFormats{$severity}) {
 	$severity = "DEFAULT";
     }
@@ -193,8 +193,10 @@ Returns the name of the host that a sock
 =cut
 
 sub GetPeername {
-    my $connection = shift;
-    my $AdrFamily  = shift;
+
+
+    my ($connection, $AdrFamily) = @_;
+
     my $peer       = $connection->peername();
     my $peerport;
     my $peerip;
@@ -217,16 +219,18 @@ Invoked to issue a debug message.
 =cut
 
 sub Debug {
-    my $level   = shift;
-    my $message = shift;
+
+    my ($level, $message) = @_;
+
     if ($level <= $DebugLevel) {
 	Log("INFO", "-Debug- $message host = $RemoteHost");
     }
 }
 
 sub SocketDump {
-    my $level = shift;
-    my $socket= shift;
+
+    my ($level, $socket) = @_;
+
     if($level <= $DebugLevel) {
 	$socket->Dump();
     }
@@ -515,8 +519,8 @@ The transaction that is being completed.
 
 sub CompleteTransaction {
     &Debug(5,"Complete transaction");
-    my $Socket = shift;
-    my $Transaction = shift;
+
+    my ($Socket, $Transaction) = @_;
 
     if (!$Transaction->isDeferred()) { # Normal transaction
 	my $data   = $Socket->GetReply(); # Data to send.
@@ -550,9 +554,8 @@ sub CompleteTransaction {
 =cut
 
 sub StartClientReply {
-    my $Transaction   = shift;
-    my $data     = shift;
 
+    my ($Transaction, $data) = @_;
 
     my $Client   = $Transaction->getClient();
 
@@ -1164,8 +1167,8 @@ The text of the request to send.
 =cut
 
 sub StartRequest {
-    my $Lond     = shift;
-    my $Request  = shift;	# This is a LondTransaction.
+
+    my ($Lond, $Request) = @_;
     
     Debug(6, "StartRequest: ".$Request->getRequest());
 
@@ -1416,6 +1419,7 @@ into the status file.
 We also use this to reset the retries count in order to allow the
 client to retry connections with a previously dead server.
 =cut
+
 sub ChildStatus {
     my $event = shift;
     my $watcher = $event->w;
@@ -1428,16 +1432,18 @@ sub ChildStatus {
     #
     #  Write out information about each of the connections:
     #
-    print $fh "Active connection statuses: \n";
-    my $i = 1;
-    print STDERR  "================================= Socket Status Dump:\n";
-    foreach my $item (keys %ActiveConnections) {
-	my $Socket = $ActiveConnections{$item}->data;
-	my $state  = $Socket->GetState();
-	print $fh "Connection $i State: $state\n";
-	print STDERR "---------------------- Connection $i \n";
-	$Socket->Dump();
-	$i++;	
+    if ($DebugLevel > 2) {
+	print $fh "Active connection statuses: \n";
+	my $i = 1;
+	print STDERR  "================================= Socket Status Dump:\n";
+	foreach my $item (keys %ActiveConnections) {
+	    my $Socket = $ActiveConnections{$item}->data;
+	    my $state  = $Socket->GetState();
+	    print $fh "Connection $i State: $state\n";
+	    print STDERR "---------------------- Connection $i \n";
+	    $Socket->Dump();
+	    $i++;	
+	}
     }
     $ConnectionRetriesLeft = $ConnectionRetries;
 }