use unique_ptr to handle FILE* in Log

3 files changed, 40 insertions, 50 deletions

diff --git a/src/Log.cpp b/src/Log.cpp
index 0792fcf..f2219eb 100644
--- a/src/Log.cpp
+++ b/src/Log.cpp
@@ -109,6 +109,17 @@ LogLine Logger::level(log_level_t level)
     return LogLine(this, level);
 }
 
+LogToFile::LogToFile(const std::string& filename) : name("FILE")
+{
+    FILE* fd = fopen(filename.c_str(), "a");
+    if (fd == nullptr) {
+        fprintf(stderr, "Cannot open log file !");
+        throw std::runtime_error("Cannot open log file !");
+    }
+
+    log_file.reset(fd);
+}
+
 void LogToFile::log(log_level_t level, const std::string& message)
 {
     if (level != log_level_t::trace) {
@@ -116,9 +127,9 @@ void LogToFile::log(log_level_t level, const std::string& message)
             "DEBUG", "INFO", "WARN", "ERROR", "ALERT", "EMERG"};
 
         // fprintf is thread-safe
-        fprintf(log_file, SYSLOG_IDENT ": %s: %s\n",
+        fprintf(log_file.get(), SYSLOG_IDENT ": %s: %s\n",
                 log_level_text[(size_t)level], message.c_str());
-        fflush(log_file);
+        fflush(log_file.get());
     }
 }
 
@@ -142,31 +153,33 @@ void LogToSyslog::log(log_level_t level, const std::string& message)
     }
 }
 
-LogTracer::LogTracer(const string& trace_filename)
+LogTracer::LogTracer(const string& trace_filename) : name("TRACE")
 {
-    name = "TRACE";
     etiLog.level(info) << "Setting up TRACE to " << trace_filename;
 
-    m_trace_file = fopen(trace_filename.c_str(), "a");
-    if (m_trace_file == NULL) {
+    FILE* fd = fopen(trace_filename.c_str(), "a");
+    if (fd == nullptr) {
         fprintf(stderr, "Cannot open trace file !");
         throw std::runtime_error("Cannot open trace file !");
     }
+    m_trace_file.reset(fd);
 
-    auto now = chrono::steady_clock::now().time_since_epoch();
-    m_trace_micros_startup =
-        chrono::duration_cast<chrono::microseconds>(now).count();
+    using namespace std::chrono;
+    auto now = steady_clock::now().time_since_epoch();
+    m_trace_micros_startup = duration_cast<microseconds>(now).count();
 
-    fprintf(m_trace_file, "0,TRACER,startup at %ld\n", m_trace_micros_startup);
+    fprintf(m_trace_file.get(),
+            "0,TRACER,startup at %ld\n", m_trace_micros_startup);
 }
 
 void LogTracer::log(log_level_t level, const std::string& message)
 {
     if (level == log_level_t::trace) {
-        const auto now = chrono::steady_clock::now().time_since_epoch();
-        const auto micros = chrono::duration_cast<chrono::microseconds>(now).count();
+        using namespace std::chrono;
+        const auto now = steady_clock::now().time_since_epoch();
+        const auto micros = duration_cast<microseconds>(now).count();
 
-        fprintf(m_trace_file, "%ld,%s\n",
+        fprintf(m_trace_file.get(), "%ld,%s\n",
                 micros - m_trace_micros_startup,
                 message.c_str());
     }
diff --git a/src/Log.h b/src/Log.h
index ae252a6..0e09bc9 100644
--- a/src/Log.h
+++ b/src/Log.h
@@ -57,7 +57,7 @@ static const std::string levels_as_str[] =
 class LogBackend {
     public:
         virtual void log(log_level_t level, const std::string& message) = 0;
-        virtual std::string get_name() = 0;
+        virtual std::string get_name() const = 0;
 };
 
 /** A Logging backend for Syslog */
@@ -73,7 +73,7 @@ class LogToSyslog : public LogBackend {
 
         void log(log_level_t level, const std::string& message);
 
-        std::string get_name() { return name; }
+        std::string get_name() const { return name; }
 
     private:
         const std::string name;
@@ -84,27 +84,15 @@ class LogToSyslog : public LogBackend {
 
 class LogToFile : public LogBackend {
     public:
-        LogToFile(const std::string& filename) : name("FILE") {
-            log_file = fopen(filename.c_str(), "a");
-            if (log_file == NULL) {
-                fprintf(stderr, "Cannot open log file !");
-                throw std::runtime_error("Cannot open log file !");
-            }
-        }
-
-        ~LogToFile() {
-            if (log_file != NULL) {
-                fclose(log_file);
-            }
-        }
-
+        LogToFile(const std::string& filename);
         void log(log_level_t level, const std::string& message);
-
-        std::string get_name() { return name; }
+        std::string get_name() const { return name; }
 
     private:
         const std::string name;
-        FILE* log_file;
+
+        struct FILEDeleter{ void operator()(FILE* fd){ if(fd) fclose(fd);}};
+        std::unique_ptr<FILE, FILEDeleter> log_file;
 
         LogToFile(const LogToFile& other) = delete;
         const LogToFile& operator=(const LogToFile& other) = delete;
@@ -113,19 +101,14 @@ class LogToFile : public LogBackend {
 class LogTracer : public LogBackend {
     public:
         LogTracer(const std::string& filename);
-
-        ~LogTracer() {
-            if (m_trace_file != NULL) {
-                fclose(m_trace_file);
-            }
-        }
-
         void log(log_level_t level, const std::string& message);
-        std::string get_name() { return name; }
+        std::string get_name() const { return name; }
     private:
         std::string name;
-        uint64_t m_trace_micros_startup;
-        FILE* m_trace_file;
+        uint64_t m_trace_micros_startup = 0;
+
+        struct FILEDeleter{ void operator()(FILE* fd){ if(fd) fclose(fd);}};
+        std::unique_ptr<FILE, FILEDeleter> m_trace_file;
 
         LogTracer(const LogTracer& other) = delete;
         const LogTracer& operator=(const LogTracer& other) = delete;
diff --git a/src/OutputFile.h b/src/OutputFile.h
index 97fdcb7..a586921 100644
--- a/src/OutputFile.h
+++ b/src/OutputFile.h
@@ -39,14 +39,6 @@
 #include <sys/types.h>
 #include <memory>
 
-struct FILEDeleter {
-    void operator()(FILE* fd) {
-        if (fd) {
-            fclose(fd);
-        }
-    }
-};
-
 class OutputFile : public ModOutput, public ModMetadata
 {
 public:
@@ -65,6 +57,8 @@ protected:
     EtiSource *myEtiSource = nullptr;
 
     std::string myFilename;
+
+    struct FILEDeleter{ void operator()(FILE* fd){ if (fd) fclose(fd); }};
     std::unique_ptr<FILE, FILEDeleter> myFile;
 };