Revert "Introduced FileResource class for logging."

This reverts commit aa55479.
eclipse-ecal · Sep 4, 2024 · 3ea8dcd · 3ea8dcd
1 parent 0623939
commit 3ea8dcd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 140 deletions.
diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
@@ -181,7 +181,6 @@ endif()
 # logging
 ######################################
 set(ecal_logging_src
-    src/logging/ecal_file_resource.cpp
     src/logging/ecal_log.cpp
     src/logging/ecal_log_impl.cpp
     src/logging/ecal_log_impl.h

diff --git a/ecal/core/src/logging/ecal_file_resource.cpp b/ecal/core/src/logging/ecal_file_resource.cpp
diff --git a/ecal/core/src/logging/ecal_file_resource.h b/ecal/core/src/logging/ecal_file_resource.h
diff --git a/ecal/core/src/logging/ecal_log_impl.cpp b/ecal/core/src/logging/ecal_log_impl.cpp
@@ -148,7 +148,8 @@ namespace eCAL
 {
   CLog::CLog(const Logging::SAttributes& attr_) :
           m_created(false),
-          m_attributes(attr_)
+          m_attributes(attr_),
+          m_logfile(nullptr)
   {
   }
 
@@ -162,20 +163,19 @@ namespace eCAL
     // create log file if file logging is enabled
     if(m_attributes.file.enabled)
     {
-      bool file_opened = false;
       if (isDirectory(m_attributes.file.path))
       {
         const std::string tstring = get_time_str();
 
         m_logfile_name = m_attributes.file.path + tstring + "_" + m_attributes.unit_name + "_" + std::to_string(m_attributes.process_id) + ".log";
-        file_opened = m_logfile.fopen(m_logfile_name.c_str(), "w");
+        m_logfile = fopen(m_logfile_name.c_str(), "w");
       }
       else
       {
         logWarningToConsole("Logging for file enabled, but specified path to log is not valid: " + m_attributes.file.path);
       }
 
-      if (!file_opened)
+      if (m_logfile == nullptr)
       {
         logWarningToConsole("Logging for file enabled, but file could not be created.");
       }
@@ -218,7 +218,8 @@ namespace eCAL
 
     m_udp_logging_sender.reset();
 
-    if(m_logfile.isOpen()) m_logfile.fclose();
+    if(m_logfile != nullptr) fclose(m_logfile);
+    m_logfile = nullptr;
 
     m_created = false;
   }
@@ -280,8 +281,8 @@ namespace eCAL
 
       if (log_to_file)
       {
-        m_logfile.fprintf("%s\n", m_log_message_stream.str().c_str());
-        m_logfile.fflush();
+        fprintf(m_logfile, "%s\n", m_log_message_stream.str().c_str());
+        fflush(m_logfile);
       }
     }
 

diff --git a/ecal/core/src/logging/ecal_log_impl.h b/ecal/core/src/logging/ecal_log_impl.h
@@ -35,7 +35,6 @@
 
 #include "attributes/logging_attributes.h"
 #include "ecal_global_accessors.h"
-#include "ecal_file_resource.h"
 
 #include <atomic>
 #include <list>
@@ -44,7 +43,6 @@
 #include <string>
 #include <vector>
 
-
 namespace eCAL
 {
   class CLog
@@ -143,7 +141,7 @@ namespace eCAL
     std::shared_ptr<UDP::CSampleReceiver>  m_log_receiver;
 
     std::string                            m_logfile_name;
-    Logging::FileResource                  m_logfile;
+    FILE*                                  m_logfile;
 
     Logging::SAttributes                   m_attributes;
     std::stringstream                      m_log_message_stream;