[LON-CAPA-cvs] cvs: loncom / loncnew
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 17 Feb 2004 15:09:08 -0000
albertel Tue Feb 17 10:09:08 2004 EDT
Modified files:
/loncom loncnew
Log:
- retabinate
Index: loncom/loncnew
diff -u loncom/loncnew:1.42 loncom/loncnew:1.43
--- loncom/loncnew:1.42 Tue Feb 17 04:43:21 2004
+++ loncom/loncnew Tue Feb 17 10:09:08 2004
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# lonc maintains the connections to remote computers
#
-# $Id: loncnew,v 1.42 2004/02/17 09:43:21 foxr Exp $
+# $Id: loncnew,v 1.43 2004/02/17 15:09:08 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -263,7 +263,7 @@
Debug(0, " SocketTimeout called: ");
$Socket->Dump();
if(exists($ActiveTransactions{$Socket})) {
- FailTransaction($ActiveTransactions{$Socket});
+ FailTransaction($ActiveTransactions{$Socket});
}
KillSocket($Socket); # A transaction timeout also counts as
# a connection failure:
@@ -959,16 +959,16 @@
# so that the writing states are actually NO-OPs.
if ($Socket->Writable() != 0) {
- # The write resulted in an error.
- # We'll treat this as if the socket got disconnected:
- Log("WARNING", "Connection to ".$RemoteHost.
- " has been disconnected");
- if(exists($ActiveTransactions{$Socket})) {
- FailTransaction($ActiveTransactions{$Socket});
- }
- $Watcher->cancel();
- KillSocket($Socket);
- return;
+ # The write resulted in an error.
+ # We'll treat this as if the socket got disconnected:
+ Log("WARNING", "Connection to ".$RemoteHost.
+ " has been disconnected");
+ if(exists($ActiveTransactions{$Socket})) {
+ FailTransaction($ActiveTransactions{$Socket});
+ }
+ $Watcher->cancel();
+ KillSocket($Socket);
+ return;
}