Merge pull request #61 from CESNET/sedlak-fds-output-tmp-suffix

Sedlak fds output tmp suffix

Author: Lukas955

src/plugins/output/fds/src/Storage.cpp

@@ -17,6 +17,8 @@
 #include <libgen.h>
 #include "Storage.hpp"
 
+const std::string TMP_SUFFIX = ".tmp";
+
 Storage::Storage(ipx_ctx_t *ctx, const Config &cfg) : m_ctx(ctx), m_path(cfg.m_path)
 {
     // Check if the directory exists
@@ -46,14 +48,20 @@ Storage::Storage(ipx_ctx_t *ctx, const Config &cfg) : m_ctx(ctx), m_path(cfg.m_p
     m_flags |= FDS_FILE_APPEND;
 }
 
+Storage::~Storage()
+{
+    window_close();
+}
+
 void
 Storage::window_new(time_t ts)
 {
     // Close the current window if exists
     window_close();
 
     // Open new file
-    const std::string new_file = filename_gen(ts);
+    const std::string new_file = filename_gen(ts) + TMP_SUFFIX;
+    m_file_name = new_file;
     std::unique_ptr<char, decltype(&free)> new_file_cpy(strdup(new_file.c_str()), &free);
 
     char *dir2create;
@@ -80,8 +88,14 @@ Storage::window_new(time_t ts)
 void
 Storage::window_close()
 {
+    bool file_opened = (m_file.get() != nullptr);
     m_file.reset();
     m_session2params.clear();
+    if (file_opened) {
+        std::string new_file_name(m_file_name.begin(), m_file_name.end() - TMP_SUFFIX.size());
+        std::rename(m_file_name.c_str(), new_file_name.c_str());
+        m_file_name.clear();
+    }
 }
 
 void

src/plugins/output/fds/src/Storage.hpp

@@ -36,7 +36,7 @@ class Storage {
      * @throw FDS_exception if @p path directory doesn't exist in the system
      */
     Storage(ipx_ctx_t *ctx, const Config &cfg);
-    virtual ~Storage() = default;
+    virtual ~Storage();
 
     // Disable copy constructors
     Storage(const Storage &other) = delete;
@@ -105,6 +105,8 @@ class Storage {
 
     /// Output FDS file
     std::unique_ptr<fds_file_t, decltype(&fds_file_close)> m_file = {nullptr, &fds_file_close};
+    /// Output FDS file name
+    std::string m_file_name;
     /// Mapping of Transport Sessions to FDS specific parameters
     std::map<const struct ipx_session *, struct session_ctx> m_session2params;