summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 19:30:16 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 19:30:16 +0000
commit3ab155c9b0b17d7edd376091ed6f2ac6a4695457 (patch)
tree864a23dbec10048c4a9fb9e0e468490c6483926a /net
parent75998f628427d0e1da2c2ef00850a7c80dc3c8af (diff)
downloadchromium_src-3ab155c9b0b17d7edd376091ed6f2ac6a4695457.zip
chromium_src-3ab155c9b0b17d7edd376091ed6f2ac6a4695457.tar.gz
chromium_src-3ab155c9b0b17d7edd376091ed6f2ac6a4695457.tar.bz2
Made logging not look up --enable-dcheck from command line
Made --enable-dcheck a parameter to InitLogging() and fixed up all callsites. BUG=62736 TEST=Manual Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=70782 Review URL: http://codereview.chromium.org/6070006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/tools/flip_server/flip_in_mem_edsm_server.cc3
-rw-r--r--net/tools/testserver/run_testserver.cc10
-rw-r--r--net/tools/tld_cleanup/tld_cleanup.cc10
3 files changed, 14 insertions, 9 deletions
diff --git a/net/tools/flip_server/flip_in_mem_edsm_server.cc b/net/tools/flip_server/flip_in_mem_edsm_server.cc
index a378e72..6d4ed8f 100644
--- a/net/tools/flip_server/flip_in_mem_edsm_server.cc
+++ b/net/tools/flip_server/flip_in_mem_edsm_server.cc
@@ -3057,7 +3057,8 @@ int main (int argc, char**argv)
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::APPEND_TO_OLD_LOG_FILE,
+ logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
LOG(INFO) << "Flip SPDY proxy started with configuration:";
LOG(INFO) << "Logging destination : " << g_proxy_config.log_destination_;
diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc
index 650b415..bfaa682 100644
--- a/net/tools/testserver/run_testserver.cc
+++ b/net/tools/testserver/run_testserver.cc
@@ -24,10 +24,12 @@ int main(int argc, const char* argv[]) {
CommandLine::Init(argc, argv);
CommandLine* command_line = CommandLine::ForCurrentProcess();
- if (!logging::InitLogging(FILE_PATH_LITERAL("testserver.log"),
- logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
- logging::LOCK_LOG_FILE,
- logging::APPEND_TO_OLD_LOG_FILE)) {
+ if (!logging::InitLogging(
+ FILE_PATH_LITERAL("testserver.log"),
+ logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
+ logging::LOCK_LOG_FILE,
+ logging::APPEND_TO_OLD_LOG_FILE,
+ logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS)) {
printf("Error: could not initialize logging. Exiting.\n");
return -1;
}
diff --git a/net/tools/tld_cleanup/tld_cleanup.cc b/net/tools/tld_cleanup/tld_cleanup.cc
index e055577..be723c4 100644
--- a/net/tools/tld_cleanup/tld_cleanup.cc
+++ b/net/tools/tld_cleanup/tld_cleanup.cc
@@ -266,10 +266,12 @@ int main(int argc, const char* argv[]) {
FilePath log_filename;
PathService::Get(base::DIR_EXE, &log_filename);
log_filename = log_filename.AppendASCII("tld_cleanup.log");
- logging::InitLogging(log_filename.value().c_str(),
- destination,
- logging::LOCK_LOG_FILE,
- logging::DELETE_OLD_LOG_FILE);
+ logging::InitLogging(
+ log_filename.value().c_str(),
+ destination,
+ logging::LOCK_LOG_FILE,
+ logging::DELETE_OLD_LOG_FILE,
+ logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
icu_util::Initialize();