ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the two bugs that are causing us the most pain. If we encounter an error while processing or handling

Browse Source 
a connection, don't destroy the endpoint.
This commit is contained in:
JoelKatz
2012-12-12 21:17:00 -08:00
parent 02897d37f6
commit caf6be04b4
1 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/cpp/websocketpp/src/roles/server.hpp
View File

@@ -301,7 +301,14 @@ void server<endpoint>::start_listen(const boost::asio::ip::tcp::endpoint& e,size
if(num_threads == 0)
{
m_endpoint.run_internal();
for (;;) {
try {
m_endpoint.run_internal();
break;
} catch (const std::exception & e) { // Don't let an exception trash the endpoint DJS
m_endpoint.elog().at(log::elevel::RERROR) << "run_internal exception: " << e.what() << log::endl;
}
}
m_state = IDLE;
}
}
@@ -382,35 +389,43 @@ void server<endpoint>::handle_accept(connection_ptr con,
const boost::system::error_code& error)
{
boost::lock_guard<boost::recursive_mutex> lock(m_endpoint.m_lock);
if (error) {
con->m_fail_code = fail::status::SYSTEM;
con->m_fail_system = error;
if (error == boost::system::errc::too_many_files_open) {
con->m_fail_reason = "too many files open";
// TODO: make this configurable
//m_timer.expires_from_now(boost::posix_time::milliseconds(1000));
//m_timer.async_wait(boost::bind(&type::start_accept,this));
} else if (error == boost::asio::error::operation_aborted) {
con->m_fail_reason = "io_service operation canceled";
// the operation was canceled. This was probably due to the
// io_service being stopped.
} else {
con->m_fail_reason = "unknown";
}
m_endpoint.m_elog->at(log::elevel::RERROR)
<< "async_accept returned error: " << error
<< " (" << con->m_fail_reason << ")" << log::endl;
con->terminate(false);
} else {
con->start();
}
try
{
if (error) {
con->m_fail_code = fail::status::SYSTEM;
con->m_fail_system = error;
if (error == boost::system::errc::too_many_files_open) {
con->m_fail_reason = "too many files open";
// TODO: make this configurable
//m_timer.expires_from_now(boost::posix_time::milliseconds(1000));
//m_timer.async_wait(boost::bind(&type::start_accept,this));
} else if (error == boost::asio::error::operation_aborted) {
con->m_fail_reason = "io_service operation canceled";
// the operation was canceled. This was probably due to the
// io_service being stopped.
} else {
con->m_fail_reason = "unknown";
}
m_endpoint.m_elog->at(log::elevel::RERROR)
<< "async_accept returned error: " << error
<< " (" << con->m_fail_reason << ")" << log::endl;
con->terminate(false);
} else {
con->start();
}
}
catch (const std::exception & e)
{ // We must call start_accept, even if we throw DJS
m_endpoint.m_elog->at(log::elevel::RERROR)
<< "handle_accept caught exception: " << e.what() << log::endl;
}
this->start_accept();
}