[LON-CAPA-cvs] cvs: loncom / loncnew

[foxr]

foxr		Tue Jun 24 21:54:44 2003 EDT

  Modified files:              
    /loncom	loncnew 
  Log:
  Fix more problems with transaction failure.
  
  
Index: loncom/loncnew
diff -u loncom/loncnew:1.10 loncom/loncnew:1.11
--- loncom/loncnew:1.10	Mon Jun 23 22:46:04 2003
+++ loncom/loncnew	Tue Jun 24 21:54:44 2003
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.10 2003/06/24 02:46:04 foxr Exp $
+# $Id: loncnew,v 1.11 2003/06/25 01:54:44 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,6 +46,9 @@
 
 # Change log:
 #    $Log: loncnew,v $
+#    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
@@ -284,10 +287,10 @@
 sub Tick {
     my $client;
     ShowStatus(GetServerHost()." Connection count: ".$ConnectionCount);
-    Debug(6, "Tick");
-    Debug(6, "    Current connection count: ".$ConnectionCount);
+    Debug(10,"Tick");
+    Debug(10,"    Current connection count: ".$ConnectionCount);
     foreach $client (keys %ActiveClients) {
-	Debug(7, "    Have client:  with id: ".$ActiveClients{$client});
+	Debug(10,"    Have client:  with id: ".$ActiveClients{$client});
     }
     # Is it time to prune connection count:
 
@@ -558,9 +561,9 @@
     my $transaction = shift;
     Debug(1, "Failing transaction: ".$transaction->getRequest());
     if (!$transaction->isDeferred()) { # If the transaction is deferred we'll get to it.
-	my $client  = $transcation->getClient();
+	my $client  = $transaction->getClient();
 	Debug(1," Replying con_lost to ".$transaction->getRequest());
-	StartClientReply($client, "con_lost\n");
+	StartClientReply($transaction, "con_lost\n");
     }
 
 }