refectors session into client_session/server_session/core, adds client handler and chat_client example. Client functionality is experimental and non-compliant at the moment.

This commit is contained in:
Peter Thorson
2011-09-26 09:49:52 -05:00
parent 7d938df15e
commit da1795feac
29 changed files with 2100 additions and 452 deletions

View File

@@ -37,7 +37,9 @@ using websocketpp::server;
server::server(boost::asio::io_service& io_service,
const tcp::endpoint& endpoint,
connection_handler_ptr defc)
: m_max_message_size(DEFAULT_MAX_MESSAGE_SIZE),
: m_elog_level(LOG_ALL),
m_alog_level(ALOG_ALL),
m_max_message_size(DEFAULT_MAX_MESSAGE_SIZE),
m_io_service(io_service),
m_acceptor(io_service, endpoint),
m_def_con_handler(defc) {}
@@ -61,11 +63,47 @@ void server::set_max_message_size(uint64_t val) {
// Throw exception
// Log error and set value to maximum allowed
// Log error and leave value at whatever it was before
throw server_error(err.str());
log(err.str(),LOG_WARN);
//throw server_error(err.str());
}
m_max_message_size = val;
}
bool server::test_elog_level(uint16_t level) {
return (level >= m_elog_level);
}
void server::set_elog_level(uint16_t level) {
std::stringstream msg;
msg << "Error logging level changing from "
<< m_elog_level << " to " << level;
log(msg.str(),LOG_INFO);
m_elog_level = level;
}
bool server::test_alog_level(uint16_t level) {
return (level & m_alog_level);
}
void server::set_alog_level(uint16_t level) {
if (test_alog_level(level)) {
return;
}
std::stringstream msg;
msg << "Access logging level " << level << " being set";
access_log(msg.str(),ALOG_INFO);
m_alog_level |= level;
}
void server::unset_alog_level(uint16_t level) {
if (!test_alog_level(level)) {
return;
}
std::stringstream msg;
msg << "Access logging level " << level << " being unset";
access_log(msg.str(),ALOG_INFO);
m_alog_level &= ~level;
}
bool server::validate_host(std::string host) {
if (m_hosts.find(host) == m_hosts.end()) {
return false;
@@ -80,13 +118,19 @@ bool server::validate_message_size(uint64_t val) {
return true;
}
void server::error_log(std::string msg) {
void server::log(std::string msg,uint16_t level) {
if (!test_elog_level(level)) {
return;
}
std::cerr << "[Error Log] "
<< boost::posix_time::to_iso_extended_string(
boost::posix_time::second_clock::local_time())
<< " " << msg << std::endl;
}
void server::access_log(std::string msg) {
void server::access_log(std::string msg,uint16_t level) {
if (!test_alog_level(level)) {
return;
}
std::cout << "[Access Log] "
<< boost::posix_time::to_iso_extended_string(
boost::posix_time::second_clock::local_time())
@@ -94,31 +138,31 @@ void server::access_log(std::string msg) {
}
void server::start_accept() {
session_ptr new_ws(new session(shared_from_this(),
m_io_service,
m_def_con_handler));
server_session_ptr new_session(new server_session(shared_from_this(),
m_io_service,
m_def_con_handler));
m_acceptor.async_accept(
new_ws->socket(),
new_session->socket(),
boost::bind(
&server::handle_accept,
this,
new_ws,
new_session,
boost::asio::placeholders::error
)
);
}
void server::handle_accept(session_ptr session,
void server::handle_accept(server_session_ptr session,
const boost::system::error_code& error) {
if (!error) {
session->start();
session->on_connect();
} else {
std::stringstream err;
err << "Error accepting socket connection: " << error;
error_log(err.str());
log(err.str(),LOG_ERROR);
throw server_error(err.str());
}