Remove flush argument

apache · Sep 19, 2023 · 84abc4d · 84abc4d
1 parent cfbf781
commit 84abc4d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/libminifi/include/core/logging/LoggerConfiguration.h b/libminifi/include/core/logging/LoggerConfiguration.h
@@ -98,15 +98,15 @@ class LoggerConfiguration {
    */
   void initialize(const std::shared_ptr<LoggerProperties> &logger_properties);
 
-  static std::vector<std::unique_ptr<io::InputStream>> getCompressedLogs(bool flush = false) {
-    return getCompressedLogs(std::chrono::milliseconds{0}, flush);
+  static std::vector<std::unique_ptr<io::InputStream>> getCompressedLogs() {
+    return getCompressedLogs(std::chrono::milliseconds{0});
   }
 
   void initializeAlertSinks(core::controller::ControllerServiceProvider* controller, const std::shared_ptr<AgentIdentificationProvider>& agent_id);
 
   template<class Rep, class Period>
-  static std::vector<std::unique_ptr<io::InputStream>> getCompressedLogs(const std::chrono::duration<Rep, Period>& time, bool flush = false) {
-    return getConfiguration().compression_manager_.getCompressedLogs(time, flush);
+  static std::vector<std::unique_ptr<io::InputStream>> getCompressedLogs(const std::chrono::duration<Rep, Period>& time) {
+    return getConfiguration().compression_manager_.getCompressedLogs(time);
   }
 
   /**

diff --git a/libminifi/include/core/logging/internal/CompressionManager.h b/libminifi/include/core/logging/internal/CompressionManager.h
@@ -51,10 +51,10 @@ class CompressionManager {
   std::shared_ptr<LogCompressorSink> initialize(const std::shared_ptr<LoggerProperties>& properties, const std::shared_ptr<Logger>& error_logger, const LoggerFactory& logger_factory);
 
   template<class Rep, class Period>
-  std::vector<std::unique_ptr<io::InputStream>> getCompressedLogs(const std::chrono::duration<Rep, Period>& time, bool flush = false) {
+  std::vector<std::unique_ptr<io::InputStream>> getCompressedLogs(const std::chrono::duration<Rep, Period>& time) {
     std::shared_ptr<internal::LogCompressorSink> sink = getSink();
     if (sink) {
-      return sink->getContent(time, flush);
+      return sink->getContent(time);
     }
     return {};
   }

diff --git a/libminifi/include/core/logging/internal/LogCompressorSink.h b/libminifi/include/core/logging/internal/LogCompressorSink.h
@@ -58,17 +58,15 @@ class LogCompressorSink : public spdlog::sinks::base_sink<std::mutex> {
   ~LogCompressorSink() override;
 
   template<class Rep, class Period>
-  std::vector<std::unique_ptr<io::InputStream>> getContent(const std::chrono::duration<Rep, Period>& time, bool flush = false) {
-    if (flush) {
-      cached_logs_.commit();
-      compress(true);
-    }
+  std::vector<std::unique_ptr<io::InputStream>> getContent(const std::chrono::duration<Rep, Period>& time) {
+    cached_logs_.commit();
+    compress(true);
 
     std::vector<std::unique_ptr<io::InputStream>> log_segments;
     const auto segment_count = compressed_logs_.itemCount();
     for (size_t i = 0; i < segment_count; ++i) {
       LogBuffer compressed;
-      if (!compressed_logs_.tryDequeue(compressed, time) && flush) {
+      if (!compressed_logs_.tryDequeue(compressed, time)) {
         break;
       }
       log_segments.push_back(std::move(compressed.buffer_));

diff --git a/libminifi/src/FlowController.cpp b/libminifi/src/FlowController.cpp
@@ -473,7 +473,7 @@ std::vector<BackTrace> FlowController::getTraces() {
 
 std::map<std::string, std::unique_ptr<io::InputStream>> FlowController::getDebugInfo() {
   std::map<std::string, std::unique_ptr<io::InputStream>> debug_info;
-  auto logs = core::logging::LoggerConfiguration::getCompressedLogs(true);
+  auto logs = core::logging::LoggerConfiguration::getCompressedLogs();
   for (size_t i = 0; i < logs.size(); ++i) {
     std::string index_str = i == logs.size() - 1 ? "" : "." + std::to_string(logs.size() - 1 - i);
     debug_info["minifi.log" + index_str + ".gz"] = std::move(logs[i]);

diff --git a/libminifi/test/unit/LoggerTests.cpp b/libminifi/test/unit/LoggerTests.cpp
@@ -215,7 +215,7 @@ TEST_CASE("Test Compression", "[ttl9]") {
   log_config.initialize(properties);
   auto logger = log_config.getLogger(className);
   logger->log_error("Hi there");
-  auto compressed_logs = logging::LoggerConfiguration::getCompressedLogs(true);
+  auto compressed_logs = logging::LoggerConfiguration::getCompressedLogs();
   REQUIRE(compressed_logs.size() == 1);
   auto logs = decompress(compressed_logs[0]);
   REQUIRE(logs.find("Hi there") != std::string::npos);
@@ -280,7 +280,7 @@ TEST_CASE("Setting either properties to 0 disables in-memory compressed logs", "
   log_config.initialize(properties);
   auto logger = log_config.getLogger("DisableCompressionTestLogger");
   logger->log_error("Hi there");
-  REQUIRE(logging::LoggerConfiguration::getCompressedLogs(true).empty() == is_nullptr);
+  REQUIRE(logging::LoggerConfiguration::getCompressedLogs().empty() == is_nullptr);
 }
 
 TEST_CASE("Setting max log entry length property trims long log entries", "[ttl12]") {
@@ -292,7 +292,7 @@ TEST_CASE("Setting max log entry length property trims long log entries", "[ttl1
   auto logger = log_config.getLogger("SetMaxLogEntryLengthTestLogger");
   logger->log_error("Hi there");
 
-  auto compressed_logs = logging::LoggerConfiguration::getCompressedLogs(true);
+  auto compressed_logs = logging::LoggerConfiguration::getCompressedLogs();
   REQUIRE(compressed_logs.size() == 1);
   auto logs = decompress(compressed_logs[0]);
   REQUIRE(logs.find("Hi ") == std::string::npos);
@@ -308,7 +308,7 @@ TEST_CASE("Setting max log entry length property trims long formatted log entrie
   auto logger = log_config.getLogger("SetMaxLogEntryLengthTestLogger");
   logger->log_error("Hi there %s", "John");
 
-  auto compressed_logs = logging::LoggerConfiguration::getCompressedLogs(true);
+  auto compressed_logs = logging::LoggerConfiguration::getCompressedLogs();
   REQUIRE(compressed_logs.size() == 1);
   auto logs = decompress(compressed_logs[0]);
   REQUIRE(logs.find("Hi ") == std::string::npos);
@@ -326,7 +326,7 @@ TEST_CASE("Setting max log entry length to a size larger than the internal buffe
   std::string expected_log(1500, 'a');
   logger->log_error(log.c_str());
 
-  auto compressed_logs = logging::LoggerConfiguration::getCompressedLogs(true);
+  auto compressed_logs = logging::LoggerConfiguration::getCompressedLogs();
   REQUIRE(compressed_logs.size() == 1);
   auto logs = decompress(compressed_logs[0]);
   REQUIRE(logs.find(log) == std::string::npos);
@@ -348,7 +348,7 @@ TEST_CASE("Setting max log entry length to unlimited results in unlimited log en
   std::string log(5000, 'a');
   logger->log_error(log.c_str());
 
-  auto compressed_logs = logging::LoggerConfiguration::getCompressedLogs(true);
+  auto compressed_logs = logging::LoggerConfiguration::getCompressedLogs();
   REQUIRE(compressed_logs.size() == 1);
   auto logs = decompress(compressed_logs[0]);
   REQUIRE(logs.find(log) != std::string::npos);
@@ -380,7 +380,7 @@ TEST_CASE("Test sending multiple segments at once", "[ttl16]") {
 
   LoggerTestAccessor::runCompression(log_config);
 
-  auto compressed_logs = logging::LoggerConfiguration::getCompressedLogs(true);
+  auto compressed_logs = logging::LoggerConfiguration::getCompressedLogs();
   REQUIRE(compressed_logs.size() == SEGMENT_COUNT);
   auto logs = decompress(compressed_logs[SEGMENT_COUNT - 1]);
   REQUIRE(logs.find(log_str) != std::string::npos);