commit d570820920e030fefd9644fb5427b538160af1a1
author Steve Fung <stevefung@chromium.org> Sun Sep 28 23:24:06 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Oct 09 20:42:45 2014 +0000
tree 224e43b57c1b1c60732fd8fa16fb5f46b8706ce8
parent d603ba9ff52c72a68556495245e1069c991866d4

update_engine: remove gflags from daemon

We are switching to using chromeos/flag_helper.h instead to standardize the
code everywhere.

BUG=chromium:402635
TEST=`FEATURES=test emerge-panther update_engine`
TEST=`cbuildbot --remote --hwtest -p 'chromiumos/platform2'
      {falco,link}-paladin` passes

Change-Id: I873462f6ba8b24086b423572fe2b0bc81e80e4f4
Reviewed-on: https://chromium-review.googlesource.com/212520
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Steve Fung <stevefung@chromium.org>
Tested-by: Steve Fung <stevefung@chromium.org>

main.cc

diff --git a/main.cc b/main.cc
index cf77f74..763e823 100644
--- a/main.cc
+++ b/main.cc
@@ -14,7 +14,7 @@
 #include <base/strings/string_util.h>
 #include <base/strings/stringprintf.h>
 #include <base/time/time.h>
-#include <gflags/gflags.h>
+#include <chromeos/flag_helper.h>
 #include <glib.h>
 #include <metrics/metrics_library.h>
 #include <sys/stat.h>
@@ -34,11 +34,6 @@
 }
 #include "update_engine/utils.h"
 
-DEFINE_bool(logtostderr, false,
-            "Write logs to stderr instead of to a file in log_dir.");
-DEFINE_bool(foreground, false,
-            "Don't daemon()ize; run in foreground.");
-
 using std::string;
 using std::vector;
 
@@ -156,13 +151,13 @@
   return kLogSymlink;
 }
 
-void SetupLogging() {
+void SetupLogging(bool log_to_std_err) {
   string log_file;
   logging::LoggingSettings log_settings;
   log_settings.lock_log = logging::DONT_LOCK_LOG_FILE;
   log_settings.delete_old = logging::APPEND_TO_OLD_LOG_FILE;
 
-  if (FLAGS_logtostderr) {
+  if (log_to_std_err) {
     // Log to stderr initially.
     log_settings.log_file = nullptr;
     log_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
@@ -179,14 +174,18 @@
 }  // namespace chromeos_update_engine
 
 int main(int argc, char** argv) {
+  DEFINE_bool(logtostderr, false,
+              "Write logs to stderr instead of to a file in log_dir.");
+  DEFINE_bool(foreground, false,
+              "Don't daemon()ize; run in foreground.");
+
   ::g_type_init();
   dbus_threads_init_default();
   base::AtExitManager exit_manager;  // Required for base/rand_util.h.
   chromeos_update_engine::Terminator::Init();
   chromeos_update_engine::Subprocess::Init();
-  google::ParseCommandLineFlags(&argc, &argv, true);
-  CommandLine::Init(argc, argv);
-  chromeos_update_engine::SetupLogging();
+  chromeos::FlagHelper::Init(argc, argv, "Chromium OS Update Engine");
+  chromeos_update_engine::SetupLogging(FLAGS_logtostderr);
   if (!FLAGS_foreground)
     PLOG_IF(FATAL, daemon(0, 0) == 1) << "daemon() failed";