diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 21:15:33 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 21:15:33 +0000 |
| commit | 5e3f7c2124c2ebf1b83effac1eb843d905112cc9 (patch) | |
| tree | e5118c79feba3baaf5081e9ed349e104aff36986 /tools | |
| parent | f25eb36e3344223ffcabcf96d54cf000862d6088 (diff) | |
| download | chromium_src-5e3f7c2124c2ebf1b83effac1eb843d905112cc9.zip chromium_src-5e3f7c2124c2ebf1b83effac1eb843d905112cc9.tar.gz chromium_src-5e3f7c2124c2ebf1b83effac1eb843d905112cc9.tar.bz2 | |
Define a LoggingSettings struct to use for InitLogging()
Update all callers of InitLogging() to use LoggingSettings, only
setting fields that need a non-default value.
Turn LoggingDestination enum into a bit field and define add
LOG_DEFAULT and LOG_ALL constants.
Fix erroneous comment saying that the default was to not lock
the log file.
BUG=247594
TBR=brettw@chromium.org, cpu@chromium.org, gene@chromium.org, jam@chromium.org, rch@chromium.org, scherkus@chromium.org, sergeyu@chromium.org, sky@chromium.org, tkent@chromium.org, yfriedman@chromium.org, zea@chromium.org
Review URL: https://codereview.chromium.org/16519003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/forwarder2/daemon.cc | 16 | ||||
| -rw-r--r-- | tools/set_default_handler/set_default_handler_main.cc | 9 |
2 files changed, 14 insertions, 11 deletions
diff --git a/tools/android/forwarder2/daemon.cc b/tools/android/forwarder2/daemon.cc index 5562116..afbf41c 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, diff --git a/tools/set_default_handler/set_default_handler_main.cc b/tools/set_default_handler/set_default_handler_main.cc index dad4536..7f2d9da 100644 --- a/tools/set_default_handler/set_default_handler_main.cc +++ b/tools/set_default_handler/set_default_handler_main.cc @@ -31,10 +31,11 @@ int wmain(int argc, wchar_t* argv[]) { CommandLine::Init(0, NULL); // The exit manager is in charge of calling the dtors of singletons. base::AtExitManager exit_manager; - logging::InitLogging(NULL, logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG, - 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 = logging::LOG_TO_SYSTEM_DEBUG_LOG; + settings.dcheck_state = + logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS; + logging::InitLogging(settings); logging::SetMinLogLevel(logging::LOG_VERBOSE); ui::win::CreateATLModuleIfNeeded(); |