Clean up code

Author: ecbadeaux

libs/writer/writer_types/include/udp_writer.h

@@ -23,4 +23,5 @@ class UDPWriter final : public BaseWriter
     bool m_socketEstablished;
 
     bool CreateSocket();
+    bool TryToSend(const std::string& message);
 };

libs/writer/writer_types/include/uds_writer.h

@@ -22,4 +22,5 @@ class UDSWriter final : public BaseWriter
     bool m_socketEstablished;
 
     bool CreateSocket();
+    bool TryToSend(const std::string& message);
 };

libs/writer/writer_types/src/udp_writer.cpp

@@ -17,7 +17,7 @@ UDPWriter::UDPWriter(const std::string& host, int port) :
 
 UDPWriter::~UDPWriter() { Close(); }
 
-bool UDPWriter::CreateSocket()
+bool UDPWriter::CreateSocket() try
 {
     if (m_socketEstablished)
     {
@@ -38,28 +38,49 @@ bool UDPWriter::CreateSocket()
     Logger::info("UDPWriter: Socket created for {}:{}", m_host, m_port);
     return true;
 }
-
-void UDPWriter::Write(const std::string& message)
+catch (const boost::system::system_error& ex)
 {
-    if (false == this->m_socketEstablished && false == this->CreateSocket())
-    {
-        Logger::error("UDPWriter: Failed to write message, socket not established {}:{}", m_host, m_port);
-        return;
-    }
+    Logger::error("UDP Writer: Boost exception: {}", ex.what());
+    return false;
+}
 
+bool UDPWriter::TryToSend(const std::string& message) try
+{
     boost::system::error_code ec;
     for (int i = 0; i < 3; i++)
     {
         size_t sent = m_socket->send_to(boost::asio::buffer(message.data(), message.size()), m_endpoint, 0, ec);
         if (ec || sent < message.size())
         {   
             Logger::error("UDP Writer: Failed to send message - {}, sent {} bytes out of {}", ec.message(), sent, message.size());
+            continue;
         }
-        break;
+        return true;
+    }
+    return false;
+}
+catch (const boost::system::system_error& ex)
+{
+    Logger::error("UDP Writer: Boost exception: {}", ex.what());
+    return false;
+}
+
+void UDPWriter::Write(const std::string& message)
+{
+    if (false == this->m_socketEstablished && false == this->CreateSocket())
+    {
+        Logger::error("UDPWriter: Failed to write message, socket not established {}:{}", m_host, m_port);
+        return;
+    }
+
+    if (TryToSend(message) == false)
+    {
+        Logger::error("UDP Writer: Failed to send message: {}", message);
+        this->Close();
     }
 }
 
-void UDPWriter::Close()
+void UDPWriter::Close() try
 {
     this->m_socketEstablished = false;
     if(m_socket && m_socket->is_open())
@@ -71,4 +92,8 @@ void UDPWriter::Close()
             Logger::error("UDP Writer: Error closing existing socket - {}", ec.message());
         }
     }
+}
+catch (const boost::system::system_error& ex)
+{
+    Logger::error("UDP Writer: Boost exception: {}", ex.what());
 }

libs/writer/writer_types/src/uds_writer.cpp

@@ -16,7 +16,7 @@ UDSWriter::UDSWriter(const std::string& socketPath)
 
 UDSWriter::~UDSWriter() { Close(); }
 
-bool UDSWriter::CreateSocket()
+bool UDSWriter::CreateSocket() try
 {
     if (m_socketEstablished)
     {
@@ -37,28 +37,49 @@ bool UDSWriter::CreateSocket()
     Logger::info("UDS Writer: Socket created for {}", m_socketPath);
     return true;
 }
-
-void UDSWriter::Write(const std::string& message)
+catch (const boost::system::system_error& ex)
 {
-    if (false == this->m_socketEstablished && false == this->CreateSocket())
-    {
-        Logger::error("UDS Writer: Failed to write message, socket not established {}", m_socketPath);
-        return;
-    }
+    Logger::error("UDS Writer: Boost exception: {}", ex.what());
+    return false;
+}
 
+bool UDSWriter::TryToSend(const std::string& message) try
+{
     boost::system::error_code ec;
     for (int i = 0; i < 3; i++)
     {
         size_t sent = m_socket->send_to(boost::asio::buffer(message), m_endpoint, 0, ec);
         if (ec || sent < message.size())
         {   
             Logger::error("UDS Writer: Failed to send message - {}, sent {} bytes out of {}", ec.message(), sent, message.size());
+            continue;
         }
-        break;
-    }    
+        return true;
+    }
+    return false;
+}
+catch (const boost::system::system_error& ex)
+{
+    Logger::error("UDS Writer: Boost exception: {}", ex.what());
+    return false;
 }
 
-void UDSWriter::Close()
+void UDSWriter::Write(const std::string& message)
+{
+    if (false == this->m_socketEstablished && false == this->CreateSocket())
+    {
+        Logger::error("UDS Writer: Failed to write message, socket not established {}", m_socketPath);
+        return;
+    }
+
+    if (false == this->TryToSend(message))
+    {
+        Logger::error("UDS Writer: Failed to send message: {}", message);
+        this->Close();
+    }
+}
+
+void UDSWriter::Close() try
 {
     this->m_socketEstablished = false;
     if (m_socket != nullptr && m_socket->is_open())
@@ -71,3 +92,7 @@ void UDSWriter::Close()
         }
     }
 }
+catch (const boost::system::system_error& ex)
+{
+    Logger::error("UDS Writer: Boost exception: {}", ex.what());
+}