Catch exceptions and add logging

message.cpp

@@ -31,6 +31,9 @@ std::string Decode(const std::string& data)
 
 void message::processMessage(const std::string& message)
 {
+	try
+	{
+		std::cout << "message::processMessage enter" << std::endl;
 		message::state::type state = message::state::header;
 		std::string line;
 		std::istringstream stream(message);
@@ -82,6 +85,14 @@ void message::processMessage(const std::string& message)
 			url << m_context.url << "?ip=" << m_address << "&file=" << fileName;
 			m_context.client.GetUrlContents(url.str());
 		}
+	}
+	catch (std::exception& e)
+	{
+		std::cout << "Exception: " << e.what() << std::endl;
+		std::cerr << "Exception: " << e.what() << std::endl;
+	}
+
+	std::cout << "message::processMessage exit" << std::endl;
 }
 
 message::state::type message::processHeaderLine(const std::string& line)

protocol.cpp

@@ -13,7 +13,7 @@ protocol::result protocol::openConnection(const std::string& address)
 {
 	m_address = address;
 	m_internalState = internalState::connect;
-	//std::cout << "Connection from " << address << std::endl;
+	std::cout << "Connection from " << address << std::endl;
 	return answer(protocol::state::connected, "220 AlarmServer");
 }
 
@@ -25,15 +25,18 @@ protocol::result protocol::processMessage(const std::string& message)
 
 		if (boost::iends_with(message, ".\r\n"))
 		{
+			std::cout << "-> " << " . " << std::endl;
 			::message msg(m_address, m_context, m_message);
+			std::cout << "-> " << " . " << std::endl;
 			m_internalState = internalState::helo;
+			std::cout << "-> " << " . " << std::endl;
 			return answer(protocol::state::connected, "250 Ok");
 		}
 
 		return answer(protocol::state::connected, "");
 	}
 	
-	//std::cout << "-> " << message << std::endl;
+	std::cout << "-> " << message << std::endl;
 
 	if (m_internalState == internalState::auth_login_user)
 	{
@@ -95,10 +98,8 @@ protocol::result protocol::processMessage(const std::string& message)
 
 protocol::result protocol::answer(protocol::state::type state, std::string answer) const
 {
-/*
 	if (answer.size() > 0)
 		std::cout << "<- " << answer << std::endl;
-*/
 
 	return result(state, answer);
 }