Changeset 10822 for trunk/FACT++/src/Connection.cc

Timestamp:

05/25/11 16:25:55 (13 years ago)

Author:

tbretz

Message:

Handle operation_aborted in timeouts; improved Connection::HandleSentData's output

File:

• trunk/FACT++/src/Connection.cc (modified) (5 diffs)

trunk/FACT++/src/Connection.cc

@@ -123 +123 @@
 void Connection::HandleWriteTimeout(const bs::error_code &error)
 {
+    if (error==ba::error::basic_errors::operation_aborted)
+        return;
+
     // 125: Operation canceled (bs::error_code(125, bs::system_category))
-    if (error && error!=ba::error::basic_errors::operation_aborted)
+    if (error)
     {
         ostringstream str;
@@ -155 +158 @@
 void Connection::HandleSentData(const bs::error_code& error, size_t n)
 {
-    if (error)
+    if (error && error != ba::error::not_connected)
     {
         ostringstream str;
@@ -165 +168 @@
     }
 
-    ostringstream msg;
-    msg << n << " bytes successfully sent to " << URL();
-    Message(msg);
+    if (error == ba::error::not_connected)
+    {
+        ostringstream msg;
+        msg << n << " bytes could not be sent to " << URL() << " due to missing connection.";
+        Warn(msg);
+    }
+    else
+    {
+        ostringstream msg;
+        msg << n << " bytes successfully sent to " << URL();
+        Message(msg);
+    }
 
     // This is "thread" safe because SendMessage and HandleSentMessage
@@ -236 +248 @@
 void Connection::HandleConnectionTimer(const bs::error_code &error)
 {
-    // 125: Operation canceled
-    if (error && error!=ba::error::basic_errors::operation_aborted)
+    if (error==ba::error::basic_errors::operation_aborted)
+        return;
+
+    if (error)
     {
         ostringstream str;
@@ -286 +300 @@
     fConnectionStatus = kConnecting;
 
+    // FIXME: "No route to host (syytem::113)" gives error:"Operation already in progress. (system:114)"
     ostringstream msg;
     if (!host.empty())