Add more logs to client

janekbaraniewski · Apr 28, 2024 · a768b1a · a768b1a
1 parent c5578c3
commit a768b1a
Showing 1 changed file with 32 additions and 23 deletions.
diff --git a/src/client.cpp b/src/client.cpp
@@ -13,8 +13,7 @@
 #include <boost/log/utility/setup/common_attributes.hpp>
 #include <boost/log/sources/severity_logger.hpp>
 #include <boost/log/sources/record_ostream.hpp>
-#include <boost/log/support/date_time.hpp> // Ensure this is included for date-time support
-
+#include <boost/log/support/date_time.hpp>
 
 #include "logging.h"
 #include "VirtualSerialPort.h"
@@ -28,17 +27,21 @@ using std::cerr;
 using std::endl;
 
 void init_logging() {
-    boost::log::register_simple_formatter_factory<boost::log::trivial::severity_level, char>("Severity");
-    boost::log::add_console_log(std::cout, boost::log::keywords::format = "[%TimeStamp%] [%ThreadID%] [%Severity%] %Message%");
-    boost::log::add_file_log(boost::log::keywords::file_name = "serial_client_%N.log",
-                             boost::log::keywords::rotation_size = 10 * 1024 * 1024,
-                             boost::log::keywords::time_based_rotation = boost::log::sinks::file::rotation_at_time_point(0, 0, 0),
-                             boost::log::keywords::format = "[%TimeStamp%] [%Severity%] %Message%");
+    boost::log::add_console_log(
+        std::cout,
+        boost::log::keywords::format = "[%TimeStamp%] [%ThreadID%] [%Severity%] %Message%",
+        boost::log::keywords::auto_flush = true
+    );
+    boost::log::add_file_log(
+        boost::log::keywords::file_name = "serial_client_%N.log",
+        boost::log::keywords::rotation_size = 10 * 1024 * 1024,
+        boost::log::keywords::time_based_rotation = boost::log::sinks::file::rotation_at_time_point(0, 0, 0),
+        boost::log::keywords::format = "[%TimeStamp%] [%Severity%] %Message%"
+    );
     boost::log::add_common_attributes();
+    boost::log::register_simple_formatter_factory<boost::log::trivial::severity_level, char>("Severity");
 }
 
-
-
 class SerialClient {
 private:
     io_service io_service_;
@@ -47,16 +50,20 @@ class SerialClient {
     VirtualSerialPort vsp_;
 
 public:
-    SerialClient(const std::string& server_ip, unsigned short server_port, const std::string& vsp_name)
+    SerialClient(const string& server_ip, unsigned short server_port, const string& vsp_name)
         : socket_(io_service_), vsp_(vsp_name) {
+        BOOST_LOG_TRIVIAL(info) << "Initializing client...";
         tcp::resolver resolver(io_service_);
         auto endpoint_iterator = resolver.resolve({server_ip, std::to_string(server_port)});
+        BOOST_LOG_TRIVIAL(info) << "Connecting to server at " << server_ip << ":" << server_port;
         connect(socket_, endpoint_iterator);
-
-        // vsp_.open();  // Ensure the virtual port is ready for use
+        BOOST_LOG_TRIVIAL(info) << "Connected to server.";
+        BOOST_LOG_TRIVIAL(info) << "Opening virtual serial port: " << vsp_name;
+        vsp_.open();
     }
 
     void run() {
+        BOOST_LOG_TRIVIAL(info) << "Starting client I/O operations.";
         do_read_write();
         io_service_.run();
     }
@@ -65,14 +72,16 @@ class SerialClient {
     void do_read_write() {
         socket_.async_read_some(boost::asio::buffer(buffer_), [this](boost::system::error_code ec, std::size_t length) {
             if (!ec) {
-                std::string data(buffer_.begin(), buffer_.begin() + length);
-                if (!vsp_.write(data)) {
-                    cerr << "Write to virtual serial port failed" << endl;
-                    return;
+                string data(buffer_.data(), length);
+                BOOST_LOG_TRIVIAL(info) << "Received data: " << data;
+                if (vsp_.write(data)) {
+                    BOOST_LOG_TRIVIAL(info) << "Data written to virtual serial port.";
+                } else {
+                    BOOST_LOG_TRIVIAL(error) << "Failed to write to virtual serial port.";
                 }
-                do_read_write();  // Continue reading
+                do_read_write();
             } else {
-                cerr << "Read error: " << ec.message() << endl;
+                BOOST_LOG_TRIVIAL(error) << "Read error: " << ec.message();
             }
         });
     }
@@ -85,9 +94,9 @@ int main(int argc, char* argv[]) {
         options_description desc{"Options"};
         desc.add_options()
             ("help,h", "Help screen")
-            ("server,s", value<std::string>()->default_value("127.0.0.1"), "Server IP address")
+            ("server,s", value<string>()->default_value("127.0.0.1"), "Server IP address")
             ("port,p", value<unsigned short>()->default_value(12345), "Server port")
-            ("vsp,v", value<std::string>()->required(), "Virtual serial port name");
+            ("vsp,v", value<string>()->required(), "Virtual serial port name");
 
         variables_map vm;
         store(parse_command_line(argc, argv, desc), vm);
@@ -98,9 +107,9 @@ int main(int argc, char* argv[]) {
             return 0;
         }
 
-        std::string server_ip = vm["server"].as<std::string>();
+        string server_ip = vm["server"].as<string>();
         unsigned short server_port = vm["port"].as<unsigned short>();
-        std::string vsp_name = vm["vsp"].as<std::string>();
+        string vsp_name = vm["vsp"].as<string>();
 
         SerialClient client(server_ip, server_port, vsp_name);
         client.run();