Define a LoggingSettings struct to use for InitLogging()

net/tools/flip_server/flip_in_mem_edsm_server.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <errno.h>
 #include <signal.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 
 #include <iostream>
@@ skipping 209 matching lines @@
   if (cl.HasSwitch("forward-ip-header")) {
     net::SpdySM::set_forward_ip_header(
         cl.GetSwitchValueASCII("forward-ip-header"));
     net::StreamerSM::set_forward_ip_header(
         cl.GetSwitchValueASCII("forward-ip-header"));
   }
 
   if (cl.HasSwitch("logdest")) {
     std::string log_dest_value = cl.GetSwitchValueASCII("logdest");
     if (log_dest_value.compare("file") == 0) {
-      g_proxy_config.log_destination_ = logging::LOG_ONLY_TO_FILE;
+      g_proxy_config.log_destination_ = logging::LOG_TO_FILE;
     } else if (log_dest_value.compare("system") == 0) {
-      g_proxy_config.log_destination_ = logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG;
+      g_proxy_config.log_destination_ = logging::LOG_TO_SYSTEM_DEBUG_LOG;
     } else if (log_dest_value.compare("both") == 0) {
-      g_proxy_config.log_destination_ =
-        logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG;
+      g_proxy_config.log_destination_ = logging::LOG_TO_ALL;
     } else {
       LOG(FATAL) << "Invalid logging destination value: " << log_dest_value;
     }
   } else {
     g_proxy_config.log_destination_ = logging::LOG_NONE;
   }
 
   if (cl.HasSwitch("logfile")) {
     g_proxy_config.log_filename_ = cl.GetSwitchValueASCII("logfile");
     if (g_proxy_config.log_destination_ == logging::LOG_NONE) {
-      g_proxy_config.log_destination_ = logging::LOG_ONLY_TO_FILE;
+      g_proxy_config.log_destination_ = logging::LOG_TO_FILE;
     }
-  } else if (g_proxy_config.log_destination_ == logging::LOG_ONLY_TO_FILE ||
-             g_proxy_config.log_destination_ ==
-             logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG) {
+  } else if ((g_proxy_config.log_destination_ & logging::LOG_TO_FILE) != 0) {
     LOG(FATAL) << "Logging destination requires a log file to be specified.";
   }
 
   if (cl.HasSwitch("wait-for-iface")) {
     wait_for_iface = true;
   }
 
   if (cl.HasSwitch("ssl-session-expiry")) {
     std::string session_expiry = cl.GetSwitchValueASCII("ssl-session-expiry");
     g_proxy_config.ssl_session_expiry_ = atoi(session_expiry.c_str());
   }
 
   if (cl.HasSwitch("ssl-disable-compression")) {
     g_proxy_config.ssl_disable_compression_ = true;
   }
 
   if (cl.HasSwitch("idle-timeout")) {
     g_proxy_config.idle_socket_timeout_s_ =
       atoi(cl.GetSwitchValueASCII("idle-timeout").c_str());
   }
 
   if (cl.HasSwitch("force_spdy"))
     net::SMConnection::set_force_spdy(true);
 
-  InitLogging(g_proxy_config.log_filename_.c_str(),
-              g_proxy_config.log_destination_,
-              logging::DONT_LOCK_LOG_FILE,
-              logging::APPEND_TO_OLD_LOG_FILE,
-              logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+  logging::LoggingSettings settings;
+  settings.logging_dest = g_proxy_config.log_destination_;
+  settings.log_file = g_proxy_config.log_filename_.c_str();
+  settings.lock_log = logging::DONT_LOCK_LOG_FILE;
+  logging::InitLogging(settings);
 
   LOG(INFO) << "Flip SPDY proxy started with configuration:";
   LOG(INFO) << "Logging destination     : " << g_proxy_config.log_destination_;
   LOG(INFO) << "Log file                : " << g_proxy_config.log_filename_;
   LOG(INFO) << "Forward IP Header       : "
             << (net::SpdySM::forward_ip_header().length() ?
                net::SpdySM::forward_ip_header() : "<disabled>");
   LOG(INFO) << "Wait for interfaces     : " << (wait_for_iface?"true":"false");
   LOG(INFO) << "Accept backlog size     : " << FLAGS_accept_backlog_size;
   LOG(INFO) << "Accepts per wake        : " << FLAGS_accepts_per_wake;
@@ skipping 128 matching lines @@
       break;
     }
     usleep(1000*10);  // 10 ms
   }
 
   unlink(PIDFILE);
   close(pidfile_fd);
   return 0;
 }