| Index: tools/android/forwarder2/daemon.cc
|
| diff --git a/tools/android/forwarder2/daemon.cc b/tools/android/forwarder2/daemon.cc
|
| index 5562116977000c5cb77d01e356d30212bbf408fc..afbf41c65ea3c0c81e9d97ee9ca05391bd77a1e9 100644
|
| --- a/tools/android/forwarder2/daemon.cc
|
| +++ b/tools/android/forwarder2/daemon.cc
|
| @@ -40,13 +40,15 @@ const int kNumTries = 100;
|
| const int kIdleTimeMSec = 20;
|
|
|
| void InitLoggingForDaemon(const std::string& log_file) {
|
| - CHECK(
|
| - logging::InitLogging(
|
| - log_file.c_str(),
|
| - log_file.empty() ?
|
| - logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG : logging::LOG_ONLY_TO_FILE,
|
| - logging::DONT_LOCK_LOG_FILE, logging::APPEND_TO_OLD_LOG_FILE,
|
| - logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS));
|
| + logging::LoggingSettings settings;
|
| + settings.logging_dest =
|
| + log_file.empty() ?
|
| + logging::LOG_TO_SYSTEM_DEBUG_LOG : logging::LOG_TO_FILE;
|
| + settings.log_file = log_file.c_str();
|
| + settings.lock_log = logging::DONT_LOCK_LOG_FILE;
|
| + settings.dcheck_state =
|
| + logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
|
| + CHECK(logging::InitLogging(settings));
|
| }
|
|
|
| bool RunServerAcceptLoop(const std::string& welcome_message,
|
|
|