We have working SL: logging.

SL: is server lines output.

session.cpp

@@ -1,8 +1,42 @@
 #include <boost/bind.hpp>
 #include <iostream>
 
+#include <boost/log/attributes/named_scope.hpp>
+#include <boost/log/core.hpp>
+#include <boost/log/trivial.hpp>
+
 #include "session.h"
 
+#include <string>
+
+bool replace(std::string &str, const std::string &from, const std::string &to) {
+  size_t start_pos = str.find(from);
+  if (start_pos == std::string::npos)
+    return false;
+  do {
+    str.replace(start_pos, from.length(), to);
+  } while ((start_pos = str.find(from)) != std::string::npos);
+  return true;
+}
+
+bool replace(std::string &str, const char *from, const char *to) {
+  size_t start_pos = str.find(from);
+  if (start_pos == std::string::npos)
+    return false;
+  do {
+    str.replace(start_pos, strlen(from), to);
+  } while ((start_pos = str.find(from)) != std::string::npos);
+  return true;
+}
+
+std::string clean_string(const std::string &source) {
+  std::string clean = source;
+  replace(clean, "\n", "\\n");
+  replace(clean, "\r", "\\r");
+  replace(clean, "\x1b", "^");
+  return clean;
+}
+
 session::session(boost::asio::ip::tcp::socket socket,
                  boost::asio::io_service &io_service, std::string hostname,
                  std::string port)
@@ -10,17 +44,22 @@ session::session(boost::asio::ip::tcp::socket socket,
       io_service_{io_service}, resolver_{io_service}, server_{io_service},
       timer_{io_service}, host{hostname}, port{port} {
   server_sent = 0;
+  // BOOST_LOG_NAMED_SCOPE("session");
 }
 
 void session::start(void) {
-  std::cout << "session" << std::endl;
+  BOOST_LOG_NAMED_SCOPE("session");
+  BOOST_LOG_TRIVIAL(info) << "session";
   auto self(shared_from_this());
   // read_buffer.reserve(1024);
   // do_write("Welcome!\n");
   do_read();
 }
 
-session::~session() { std::cout << "~session destructed" << std::endl; }
+session::~session() {
+  BOOST_LOG_NAMED_SCOPE("session");
+  BOOST_LOG_TRIVIAL(info) << "~session destructed";
+}
 
 void session::parse_auth(void) {
   // how many nulls should I be seeing?
@@ -38,8 +77,10 @@ void session::parse_auth(void) {
 
 void session::on_connect(const boost::system::error_code error) {
   // We've connected to the server!  WOOT WOOT!
+  BOOST_LOG_NAMED_SCOPE("session");
+
   if (!error) {
-    std::cout << "Connected to server!" << std::endl;
+    BOOST_LOG_TRIVIAL(info) << "Connected to " << host;
     to_client("Connected...\n\r");
     connected = true;
     if (rlogin_auth[0] != 0) {
@@ -61,8 +102,8 @@ void session::on_connect(const boost::system::error_code error) {
     output += port;
     output += "\n\r";
     to_client(output);
+    BOOST_LOG_TRIVIAL(error) << "Failed to connec to " << host << ":" << port;
 
-    std::cout << "Failed to connect to server." << std::endl;
     std::cout << "SHUTDOWN..." << std::endl;
     socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both);
   }
@@ -70,19 +111,23 @@ void session::on_connect(const boost::system::error_code error) {
 
 void session::dispatch_line(std::string line) {
   // Does this have \n\r still on it?  I don't want them.
-  std::cout << "SL: " << line << std::endl;
+  BOOST_LOG_NAMED_SCOPE("session");
+  BOOST_LOG_TRIVIAL(info) << "SL: " << clean_string(line);
+  // std::cout << "SL: " << line << std::endl;
   // is echo on?  if so:
 }
 
 void session::process_lines(void) {
   // break server_prompt into lines and send/process one by one.
   size_t pos;
-  while ((pos = server_prompt.find("\n\r")) != std::string::npos) {
+  // while ((pos = server_prompt.find("\n\r", 0, 2)) != std::string::npos) {
+  // while ((pos = server_prompt.find("\r\n", 0, 2)) != std::string::npos) {
+  while ((pos = server_prompt.find('\n', 0)) != std::string::npos) {
     // line
-    std::string line = server_prompt.substr(0, pos + 2);
-    server_prompt = server_prompt.substr(pos + 2);
+    std::string line = server_prompt.substr(0, pos + 1);
+    server_prompt = server_prompt.substr(pos + 1);
 
-    // Remove \n\r for dispatching
+    // Remove \n for dispatching
     std::string part = line.substr(0, pos);
     if (server_sent != 0) {
       line = line.substr(server_sent);
@@ -90,7 +135,7 @@ void session::process_lines(void) {
     };
     // display on?
     to_client(line);
-
+    replace(part, "\r", "");
     dispatch_line(part);
   }
 
@@ -157,11 +202,12 @@ void session::on_resolve(
 
   } else {
     // TO DO:
+    BOOST_LOG_NAMED_SCOPE("session");
+    BOOST_LOG_TRIVIAL(error) << "Unable to resolve: " << host;
     std::string output = "Unable to resolve: ";
     output += host;
     output += "\n\r";
     to_client(output);
-    std::cout << "Unable to resolve?" << std::endl;
     std::cout << "SHUTDOWN ..." << std::endl;
     socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both);
   }
@@ -204,8 +250,13 @@ void session::do_read(void) {
 
           } else if (length) {
             // std::cout << length << std::endl;
+
+            // Proxy Active?
+            BOOST_LOG_NAMED_SCOPE("session");
+
             to_server(read_buffer);
-            std::cout << "C: " << read_buffer << std::endl;
+            BOOST_LOG_TRIVIAL(info) << "C: " << read_buffer;
+
             // do_write(output);
           }
           do_read();

twproxy.cpp

@@ -44,14 +44,15 @@ void init_logging(void) {
   auto fmtScope = boost::log::expressions::format_named_scope(
       "Scope", boost::log::keywords::format = "%n(%f:%l)",
       boost::log::keywords::iteration = boost::log::expressions::reverse,
-      boost::log::keywords::depth = 3);
+      boost::log::keywords::depth = 2);
 
   boost::log::add_file_log(
       // This gives dated logfile name.
       boost::log::keywords::file_name = "proxy-%Y-%m-%d.log",
       // This appends to the logfile (instead of overwrite)
       boost::log::keywords::open_mode = std::ios_base::out | std::ios_base::app,
-
+      boost::log::keywords::auto_flush = true,
+      
       // boost::log::keywords::format = "[%TimeStamp%] %Severity%  : %Message%"
       boost::log::keywords::format =
           (boost::log::expressions::stream