fixed-islogfromcurrentproject func

google · Jan 31, 2024 · 71a04a1 · 71a04a1
1 parent 489d35e
commit 71a04a1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/cleanup_immediately_unittest.cc b/src/cleanup_immediately_unittest.cc
@@ -60,7 +60,7 @@ TEST(CleanImmediately, logging) {
   google::EnableLogCleaner(0h);
 
   for (unsigned i = 0; i < 1000; ++i) {
-    LOG(INFO) << "cleanup test";
+    LOG(WARNING) << "cleanup test";
   }
 
   google::DisableLogCleaner();

diff --git a/src/cleanup_with_relative_prefix_unittest.cc b/src/cleanup_with_relative_prefix_unittest.cc
@@ -61,7 +61,7 @@ TEST(CleanImmediatelyWithRelativePrefix, logging) {
   google::SetLogDestination(GLOG_INFO, "test_subdir/test_cleanup_");
 
   for (unsigned i = 0; i < 1000; ++i) {
-    LOG(INFO) << "cleanup test";
+    LOG(ERROR) << "cleanup test";
   }
 
   google::DisableLogCleaner();

diff --git a/src/logging.cc b/src/logging.cc
@@ -446,6 +446,9 @@ class LogCleaner {
 
   bool enabled() const { return enabled_; }
 
+  std::chrono::system_clock::time_point
+      next_cleanup_time;  // cycle count at which to clean overdue log
+
  private:
   vector<string> GetOverdueLogNames(
       string log_directory,
@@ -463,8 +466,6 @@ class LogCleaner {
   bool enabled_{false};
   std::chrono::minutes overdue_{
       std::chrono::duration<int, std::ratio<kSecondsInWeek>>{1}};
-  std::chrono::system_clock::time_point
-      next_cleanup_time_;  // cycle count at which to clean overdue log
 };
 
 LogCleaner log_cleaner;
@@ -855,6 +856,13 @@ inline void LogDestination::LogToAllLogfiles(
       LogDestination::MaybeLogToLogfile(static_cast<LogSeverity>(i), timestamp,
                                         message, len);
     }
+
+    // avoid scanning logs too frequently
+    if (timestamp >= log_cleaner.next_cleanup_time) {
+      log_cleaner.next_cleanup_time = timestamp +
+        std::chrono::duration_cast<std::chrono::system_clock::duration>(
+          std::chrono::duration<int32>{FLAGS_logcleansecs}); // set next cleanup time
+    }
   }
 }
 
@@ -1317,15 +1325,10 @@ void LogCleaner::Run(const std::chrono::system_clock::time_point& current_time,
   assert(!base_filename_selected || !base_filename.empty());
 
   // avoid scanning logs too frequently
-  if (current_time < next_cleanup_time_) {
+  if (current_time < next_cleanup_time) {
     return;
   }
 
-  next_cleanup_time_ =
-      current_time +
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(
-          std::chrono::duration<int32>{FLAGS_logcleansecs});
-
   vector<string> dirs;
 
   if (!base_filename_selected) {