From a79e48874bfe03cf7195474719a85f4633931050 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Wed, 5 Mar 2008 07:51:47 +0000 Subject: [PATCH] TNonblockingServer: Fix wrong exception names Reviewed By: dreiss Test Plan: trivial :) Revert: OK DiffCamp Revision: 8789 git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665556 13f79535-47bb-0310-9956-ffa450edef68 --- lib/cpp/src/server/TNonblockingServer.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/cpp/src/server/TNonblockingServer.cpp b/lib/cpp/src/server/TNonblockingServer.cpp index 32638875..640c2173 100644 --- a/lib/cpp/src/server/TNonblockingServer.cpp +++ b/lib/cpp/src/server/TNonblockingServer.cpp @@ -40,11 +40,11 @@ class TConnection::Task: public Runnable { } } } catch (TTransportException& ttx) { - cerr << "TThreadedServer client died: " << ttx.what() << endl; + cerr << "TNonblockingServer client died: " << ttx.what() << endl; } catch (TException& x) { - cerr << "TThreadedServer exception: " << x.what() << endl; + cerr << "TNonblockingServer exception: " << x.what() << endl; } catch (...) { - cerr << "TThreadedServer uncaught exception." << endl; + cerr << "TNonblockingServer uncaught exception." << endl; } // Signal completion back to the libevent thread via a socketpair @@ -355,7 +355,7 @@ void TConnection::transition() { // Register read event setRead(); - + // Try to work the socket right away // workSocket(); @@ -495,7 +495,8 @@ void TNonblockingServer::returnConnection(TConnection* connection) { } /** - * Server socket had something happen + * Server socket had something happen. We accept all waiting client + * connections on fd and assign TConnection objects to handle those requests. */ void TNonblockingServer::handleEvent(int fd, short which) { // Make sure that libevent didn't fuck up the socket handles -- 2.17.1