Glog 0.7.0 errors (#11)

* Fix build errors related to GLOG * Format code * Fix
aleksraiden · Feb 18, 2024 · 22497c4 · 22497c4
1 parent d874f20
commit 22497c4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/cli/main.cc b/src/cli/main.cc
@@ -32,6 +32,7 @@
 
 #include "config.h"
 #include "daemon_util.h"
+#include "glog/log_severity.h"
 #include "io_util.h"
 #include "pid_util.h"
 #include "scope_exit.h"
@@ -103,14 +104,16 @@ static void InitGoogleLog(const Config *config) {
 
   if (util::EqualICase(config->log_dir, "stdout")) {
     for (int level = google::INFO; level <= google::FATAL; level++) {
-      google::SetLogDestination(level, "");
+      google::SetLogDestination(static_cast<google::LogSeverity>(level), "");
     }
     FLAGS_stderrthreshold = google::ERROR;
     FLAGS_logtostdout = true;
   } else {
     FLAGS_log_dir = config->log_dir + "/";
     if (config->log_retention_days != -1) {
-      google::EnableLogCleaner(config->log_retention_days);
+      auto minutes =
+          std::chrono::duration_cast<std::chrono::minutes>(std::chrono::hours(24) * config->log_retention_days);
+      google::EnableLogCleaner(minutes);
     }
   }
 }

diff --git a/src/config/config.cc b/src/config/config.cc
@@ -541,7 +541,9 @@ void Config::initFieldCallback() {
              }
 
              if (log_retention_days != -1) {
-               google::EnableLogCleaner(log_retention_days);
+               auto minutes =
+                   std::chrono::duration_cast<std::chrono::minutes>(std::chrono::hours(24) * log_retention_days);
+               google::EnableLogCleaner(minutes);
              } else {
                google::DisableLogCleaner();
              }