From c3026e4e93d357c05da9274a4668e55fcd1a9d85 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Tue, 6 Mar 2012 19:04:43 -0600 Subject: [PATCH] renames ERROR for better cross platform support --- examples/wsperf/request.hpp | 2 +- examples/wsperf/wsperf.cpp | 2 +- src/connection.hpp | 14 +++++++------- src/logger/logger.hpp | 2 +- src/processors/hybi.hpp | 2 +- src/roles/client.hpp | 24 ++++++++++++------------ src/roles/server.hpp | 14 +++++++------- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/examples/wsperf/request.hpp b/examples/wsperf/request.hpp index 1f2ec83781..6f5eef14b5 100644 --- a/examples/wsperf/request.hpp +++ b/examples/wsperf/request.hpp @@ -99,7 +99,7 @@ struct request { e.alog().unset_level(websocketpp::log::alevel::ALL); e.elog().unset_level(websocketpp::log::elevel::ALL); - e.elog().set_level(websocketpp::log::elevel::ERROR); + e.elog().set_level(websocketpp::log::elevel::RERROR); e.elog().set_level(websocketpp::log::elevel::FATAL); e.connect(uri); diff --git a/examples/wsperf/wsperf.cpp b/examples/wsperf/wsperf.cpp index 09aff17839..971e01f209 100644 --- a/examples/wsperf/wsperf.cpp +++ b/examples/wsperf/wsperf.cpp @@ -85,7 +85,7 @@ int main(int argc, char* argv[]) { echo_endpoint.alog().unset_level(websocketpp::log::alevel::ALL); echo_endpoint.elog().unset_level(websocketpp::log::elevel::ALL); - echo_endpoint.elog().set_level(websocketpp::log::elevel::ERROR); + echo_endpoint.elog().set_level(websocketpp::log::elevel::RERROR); echo_endpoint.elog().set_level(websocketpp::log::elevel::FATAL); for (int i = 0; i < num_threads; i++) { diff --git a/src/connection.hpp b/src/connection.hpp index 014dc149ee..0d7dc31453 100644 --- a/src/connection.hpp +++ b/src/connection.hpp @@ -241,7 +241,7 @@ public: protected: void handle_socket_init(const boost::system::error_code& error) { if (error) { - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "Socket initialization failed, error code: " << error << log::endl; this->terminate(false); @@ -259,7 +259,7 @@ public: if (error == boost::asio::error::eof) { // got unexpected EOF // TODO: log error - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "Remote connection dropped unexpectedly" << log::endl; terminate(false); } else if (error == boost::asio::error::operation_aborted) { @@ -267,14 +267,14 @@ public: // all connections on this io_service) // TODO: log error - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "Terminating due to abort: " << error << log::endl; terminate(true); } else { // Other unexpected error // TODO: log error - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "Terminating due to unknown error: " << error << log::endl; terminate(false); @@ -448,7 +448,7 @@ protected: if (!msg) { // server is out of resources, close connection. - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "Server has run out of message buffers." << log::endl; terminate(true); @@ -499,7 +499,7 @@ protected: if (!msg) { // server is out of resources, close connection. - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "Server has run out of message buffers." << log::endl; terminate(true); @@ -676,7 +676,7 @@ protected: // this is called when an async asio call encounters an error void log_error(std::string msg,const boost::system::error_code& e) { - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << msg << "(" << e << ")" << log::endl; } diff --git a/src/logger/logger.hpp b/src/logger/logger.hpp index ad27e696d6..37ccdf78a0 100644 --- a/src/logger/logger.hpp +++ b/src/logger/logger.hpp @@ -79,7 +79,7 @@ namespace elevel { static const value LIBRARY = 0x2; // library usage exceptions static const value INFO = 0x4; // static const value WARN = 0x8; // - static const value ERROR = 0x10; // recoverable error + static const value RERROR = 0x10; // recoverable error static const value FATAL = 0x20; // unrecoverable error static const value ALL = 0xFFFF; diff --git a/src/processors/hybi.hpp b/src/processors/hybi.hpp index 42e7f86e08..ed410019de 100644 --- a/src/processors/hybi.hpp +++ b/src/processors/hybi.hpp @@ -236,7 +236,7 @@ public: response.add_header("Upgrade","websocket"); response.add_header("Connection","Upgrade"); } else { - //m_endpoint->elog().at(log::elevel::ERROR) + //m_endpoint->elog().at(log::elevel::RERROR) //<< "Error computing handshake sha1 hash" << log::endl; // TODO: make sure this error path works response.set_status(http::status_code::INTERNAL_SERVER_ERROR); diff --git a/src/roles/client.hpp b/src/roles/client.hpp index 038404d756..68dbe0d3e4 100644 --- a/src/roles/client.hpp +++ b/src/roles/client.hpp @@ -294,34 +294,34 @@ void client::handle_connect(connection_ptr con, con->start(); } else { if (error == boost::system::errc::connection_refused) { - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "An error occurred while establishing a connection: " << error << " (connection refused)" << log::endl; } else if (error == boost::system::errc::operation_canceled) { - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "An error occurred while establishing a connection: " << error << " (operation canceled)" << log::endl; } else if (error == boost::system::errc::connection_reset) { - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "An error occurred while establishing a connection: " << error << " (connection reset)" << log::endl; /*if (con->retry()) { - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "Retrying connection" << log::endl; connect(con->get_uri()); m_endpoint.remove_connection(con); }*/ } else if (error == boost::system::errc::timed_out) { - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "An error occurred while establishing a connection: " << error << " (operation timed out)" << log::endl; } else if (error == boost::system::errc::broken_pipe) { - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "An error occurred while establishing a connection: " << error << " (broken pipe)" << log::endl; } else { - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "An error occurred while establishing a connection: " << error << " (unknown)" << log::endl; throw "client error"; @@ -391,7 +391,7 @@ void client::connection::handle_write_request( if (error) { - m_endpoint.elog().at(log::elevel::ERROR) << "Error writing WebSocket request. code: " << error << log::endl; + m_endpoint.elog().at(log::elevel::RERROR) << "Error writing WebSocket request. code: " << error << log::endl; m_connection.terminate(false); return; @@ -422,7 +422,7 @@ void client::connection::handle_read_response ( const boost::system::error_code& error, std::size_t bytes_transferred) { if (error) { - m_endpoint.elog().at(log::elevel::ERROR) << "Error reading HTTP request. code: " << error << log::endl; + m_endpoint.elog().at(log::elevel::RERROR) << "Error reading HTTP request. code: " << error << log::endl; m_connection.terminate(false); return; } @@ -475,7 +475,7 @@ void client::connection::handle_read_response ( sha << server_key.c_str(); if (!sha.Result(message_digest)) { - m_endpoint.elog().at(log::elevel::ERROR) << "Error computing handshake sha1 hash." << log::endl; + m_endpoint.elog().at(log::elevel::RERROR) << "Error computing handshake sha1 hash." << log::endl; // TODO: close behavior return; } @@ -489,7 +489,7 @@ void client::connection::handle_read_response ( server_key = base64_encode( reinterpret_cast(message_digest),20); if (server_key != h) { - m_endpoint.elog().at(log::elevel::ERROR) << "Server returned incorrect handshake key." << log::endl; + m_endpoint.elog().at(log::elevel::RERROR) << "Server returned incorrect handshake key." << log::endl; // TODO: close behavior return; } @@ -503,7 +503,7 @@ void client::connection::handle_read_response ( m_connection.handle_read_frame(boost::system::error_code()); } catch (const http::exception& e) { - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "Error processing server handshake. Server HTTP response: " << e.m_error_msg << " (" << e.m_error_code << ") Local error: " << e.what() << log::endl; diff --git a/src/roles/server.hpp b/src/roles/server.hpp index 5e67ab9d67..3eb8f78b85 100644 --- a/src/roles/server.hpp +++ b/src/roles/server.hpp @@ -302,7 +302,7 @@ void server::handle_accept(connection_ptr con, if (error) { if (error == boost::system::errc::too_many_files_open) { - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "async_accept returned error: " << error << " (too many files open)" << log::endl; m_timer.expires_from_now(boost::posix_time::milliseconds(1000)); @@ -312,7 +312,7 @@ void server::handle_accept(connection_ptr con, // the operation was canceled. This was probably due to the // io_service being stopped. } else { - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "async_accept returned error: " << error << " (unknown)" << log::endl; } @@ -418,7 +418,7 @@ void server::connection::handle_read_request( { if (error) { // log error - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "Error reading HTTP request. code: " << error << log::endl; m_connection.terminate(false); return; @@ -519,12 +519,12 @@ void server::connection::handle_read_request( m_response.set_status(http::status_code::OK); } } catch (const http::exception& e) { - m_endpoint.elog().at(log::elevel::ERROR) << e.what() << log::endl; + m_endpoint.elog().at(log::elevel::RERROR) << e.what() << log::endl; m_response.set_status(e.m_error_code,e.m_error_msg); m_response.set_body(e.m_body); } catch (const uri_exception& e) { // there was some error building the uri - m_endpoint.elog().at(log::elevel::ERROR) << e.what() << log::endl; + m_endpoint.elog().at(log::elevel::RERROR) << e.what() << log::endl; m_response.set_status(http::status_code::BAD_REQUEST); } @@ -582,7 +582,7 @@ void server::connection::handle_write_response( // TODO: handshake timer if (error) { - m_endpoint.elog().at(log::elevel::ERROR) << "Network error writing handshake respons. code: " << error << log::endl; + m_endpoint.elog().at(log::elevel::RERROR) << "Network error writing handshake respons. code: " << error << log::endl; m_connection.terminate(false); return; @@ -596,7 +596,7 @@ void server::connection::handle_write_response( // the expected response and the connection can be closed. } else { // this was a websocket connection that ended in an error - m_endpoint.elog().at(log::elevel::ERROR) + m_endpoint.elog().at(log::elevel::RERROR) << "Handshake ended with HTTP error: " << m_response.get_status_code() << " " << m_response.get_status_msg() << log::endl;