THRIFT-926. cpp: Better exception handling in TSimpleServer

Move processing code out of main try block and created individual
try/catch's for closing down the client and it's transports (to avoid
issues with throwing exceptions from a catch block).

Also converted to using GlobalOutput instead of cerr.

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@1005171 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/lib/cpp/src/server/TSimpleServer.cpp b/lib/cpp/src/server/TSimpleServer.cpp
index 438a587..c0fd67c 100644 (file)
--- a/lib/cpp/src/server/TSimpleServer.cpp
+++ b/lib/cpp/src/server/TSimpleServer.cpp
@@ -46,7 +46,8 @@ void TSimpleServer::serve() {
     // Start the server listening
     serverTransport_->listen();
   } catch (TTransportException& ttx) {
-    cerr << "TSimpleServer::run() listen(): " << ttx.what() << endl;
+    string errStr = string("TSimpleServer::run() listen(): ") + ttx.what();
+    GlobalOutput(errStr.c_str());
     return;
   }
 
@@ -63,58 +64,83 @@ void TSimpleServer::serve() {
       outputTransport = outputTransportFactory_->getTransport(client);
       inputProtocol = inputProtocolFactory_->getProtocol(inputTransport);
       outputProtocol = outputProtocolFactory_->getProtocol(outputTransport);
-      void* connectionContext = NULL;
-      if (eventHandler_ != NULL) {
-        connectionContext = eventHandler_->createContext(inputProtocol, outputProtocol);
-      }
-      try {
-        for (;;) {
-          if (eventHandler_ != NULL) {
-            eventHandler_->processContext(connectionContext, client);
-          }
-          if (!processor_->process(inputProtocol, outputProtocol, connectionContext) ||
-              // Peek ahead, is the remote side closed?
-              !inputProtocol->getTransport()->peek()) {
-            break;
-          }
-        }
-      } catch (TTransportException& ttx) {
-        cerr << "TSimpleServer client died: " << ttx.what() << endl;
-      } catch (TException& tx) {
-        cerr << "TSimpleServer exception: " << tx.what() << endl;
-      }
-      if (eventHandler_ != NULL) {
-        eventHandler_->deleteContext(connectionContext, inputProtocol, outputProtocol);
-      }
-      inputTransport->close();
-      outputTransport->close();
-      client->close();
     } catch (TTransportException& ttx) {
       if (inputTransport != NULL) { inputTransport->close(); }
       if (outputTransport != NULL) { outputTransport->close(); }
       if (client != NULL) { client->close(); }
-      cerr << "TServerTransport died on accept: " << ttx.what() << endl;
+      string errStr = string("TServerTransport died on accept: ") + ttx.what();
+      GlobalOutput(errStr.c_str());
       continue;
     } catch (TException& tx) {
       if (inputTransport != NULL) { inputTransport->close(); }
       if (outputTransport != NULL) { outputTransport->close(); }
       if (client != NULL) { client->close(); }
-      cerr << "Some kind of accept exception: " << tx.what() << endl;
+      string errStr = string("Some kind of accept exception: ") + tx.what();
+      GlobalOutput(errStr.c_str());
       continue;
     } catch (string s) {
       if (inputTransport != NULL) { inputTransport->close(); }
       if (outputTransport != NULL) { outputTransport->close(); }
       if (client != NULL) { client->close(); }
-      cerr << "TThreadPoolServer: Unknown exception: " << s << endl;
+      string errStr = string("Some kind of accept exception: ") + s;
+      GlobalOutput(errStr.c_str());
       break;
     }
+
+    void* connectionContext = NULL;
+    if (eventHandler_ != NULL) {
+      connectionContext = eventHandler_->createContext(inputProtocol, outputProtocol);
+    }
+    try {
+      for (;;) {
+        if (eventHandler_ != NULL) {
+          eventHandler_->processContext(connectionContext, client);
+        }
+        if (!processor_->process(inputProtocol, outputProtocol, connectionContext) ||
+            // Peek ahead, is the remote side closed?
+            !inputProtocol->getTransport()->peek()) {
+          break;
+        }
+      }
+    } catch (TTransportException& ttx) {
+      string errStr = string("TSimpleServer client died: ") + ttx.what();
+      GlobalOutput(errStr.c_str());
+    } catch (TException& tx) {
+      string errStr = string("TSimpleServer exception: ") + tx.what();
+      GlobalOutput(errStr.c_str());
+    } catch (...) {
+      GlobalOutput("TSimpleServer uncaught exception.");
+    }
+    if (eventHandler_ != NULL) {
+      eventHandler_->deleteContext(connectionContext, inputProtocol, outputProtocol);
+    }
+
+    try {
+      inputTransport->close();
+    } catch (TTransportException& ttx) {
+      string errStr = string("TSimpleSimple input close failed: ") + ttx.what();
+      GlobalOutput(errStr.c_str());
+    }
+    try {
+      outputTransport->close();
+    } catch (TTransportException& ttx) {
+      string errStr = string("TSimpleSimple output close failed: ") + ttx.what();
+      GlobalOutput(errStr.c_str());
+    }
+    try {
+      client->close();
+    } catch (TTransportException& ttx) {
+      string errStr = string("TSimpleSimple client close failed: ") + ttx.what();
+      GlobalOutput(errStr.c_str());
+    }
   }
 
   if (stop_) {
     try {
       serverTransport_->close();
     } catch (TTransportException &ttx) {
-      cerr << "TServerTransport failed on close: " << ttx.what() << endl;
+      string errStr = string("TServerTransport failed on close: ") + ttx.what();
+      GlobalOutput(errStr.c_str());
     }
     stop_ = false;
   }