ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-03 08:46:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjusts whitespace

Browse Source
This commit is contained in:
Peter Thorson
2012-01-16 11:14:51 -06:00
parent 2525de2545
commit 9d422107ab
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/connection.hpp
View File

@@ -239,7 +239,9 @@ public:
protected:
void handle_socket_init(const boost::system::error_code& error) {
if (error) {
m_endpoint.elog().at(log::elevel::ERROR) << "Connection initialization failed, error code: " << error << log::endl;
m_endpoint.elog().at(log::elevel::ERROR)
<< "Socket initialization failed, error code: " << error
<< log::endl;
this->terminate(false);
return;
}
@@ -255,20 +257,24 @@ public:
if (error == boost::asio::error::eof) {
// got unexpected EOF
// TODO: log error
m_endpoint.elog().at(log::elevel::ERROR) << "Remote connection dropped unexpectedly" << log::endl;
m_endpoint.elog().at(log::elevel::ERROR)
<< "Remote connection dropped unexpectedly" << log::endl;
terminate(false);
} else if (error == boost::asio::error::operation_aborted) {
// got unexpected abort (likely our server issued an abort on
// all connections on this io_service)
// TODO: log error
m_endpoint.elog().at(log::elevel::ERROR) << "Terminating due to abort: " << error << log::endl;
m_endpoint.elog().at(log::elevel::ERROR)
<< "Terminating due to abort: " << error << log::endl;
terminate(true);
} else {
// Other unexpected error
// TODO: log error
m_endpoint.elog().at(log::elevel::ERROR) << "Terminating due to unknown error: " << error << log::endl;
m_endpoint.elog().at(log::elevel::ERROR)
<< "Terminating due to unknown error: " << error
<< log::endl;
terminate(false);
}
}
@@ -578,7 +584,8 @@ protected:
// if we are in an inturrupted state and had nothing else to write
// it is safe to terminate the connection.
if (m_write_state == INTURRUPT) {
m_endpoint.alog().at(log::alevel::DEBUG_CLOSE) << "Exit after inturrupt" << log::endl;
m_endpoint.alog().at(log::alevel::DEBUG_CLOSE)
<< "Exit after inturrupt" << log::endl;
terminate(false);
}
}
@@ -588,7 +595,9 @@ protected:
if (error) {
if (error == boost::asio::error::operation_aborted) {
// previous write was aborted
m_endpoint.alog().at(log::alevel::DEBUG_CLOSE) << "handle_write was called with operation_aborted error" << log::endl;
m_endpoint.alog().at(log::alevel::DEBUG_CLOSE)
<< "handle_write was called with operation_aborted error"
<< log::endl;
} else {
log_error("Error writing frame data",error);
terminate(false);
@@ -597,7 +606,8 @@ protected:
}
if (m_write_queue.size() == 0) {
m_endpoint.alog().at(log::alevel::DEBUG_CLOSE) << "handle_write called with empty queue" << log::endl;
m_endpoint.alog().at(log::alevel::DEBUG_CLOSE)
<< "handle_write called with empty queue" << log::endl;
return;
}
@@ -614,7 +624,8 @@ protected:
// terminate cleans up a connection and removes it from the endpoint's
// connection list.
void terminate(bool failed_by_me) {
m_endpoint.alog().at(log::alevel::DEBUG_CLOSE) << "terminate called" << log::endl;
m_endpoint.alog().at(log::alevel::DEBUG_CLOSE)
<< "terminate called" << log::endl;
if (m_state == session::state::CLOSED) {
// shouldn't be here

7
src/roles/server.hpp
View File

@@ -339,7 +339,7 @@ void server<endpoint>::connection<connection_type>::async_init() {
"\r\n\r\n",
boost::bind(
&type::handle_read_request,
m_connection.shared_from_this(), // shared from this?
m_connection.shared_from_this(),
boost::asio::placeholders::error,
boost::asio::placeholders::bytes_transferred
)
@@ -353,7 +353,8 @@ void server<endpoint>::connection<connection_type>::handle_read_request(
{
if (error) {
// log error
m_endpoint.elog().at(log::elevel::ERROR) << "Error reading HTTP request. code: " << error << log::endl;
m_endpoint.elog().at(log::elevel::ERROR)
<< "Error reading HTTP request. code: " << error << log::endl;
m_connection.terminate(false);
return;
}
@@ -475,7 +476,7 @@ void server<endpoint>::connection<connection_type>::write_response() {
// TODO: HTTP response
}
m_response.replace_header("Server","WebSocket++/2011-11-18");
m_response.replace_header("Server","WebSocket++/0.2.0");
std::string raw = m_response.raw();