commit fbaee24d80b2da982b81deca03702350e656f4b5
author Gilad Arnold <garnold@chromium.org> Wed Apr 04 15:59:43 2012 -0700
committer Gerrit <chrome-bot@google.com> Wed Apr 04 23:28:46 2012 -0700
tree dbce11d478bb14584941930b5d7f9cc15321a957
parent 36e60779d082d704424ab7670a9aa047392fe52e

AU: fix proxy logging

BUG=chromium-os:28966
TEST=Passes unit tests; update logs correctly show proxy settings

Change-Id: I5fed3e0bacb12e085b7d4e53638ee7a4096cf9a5
Reviewed-on: https://gerrit.chromium.org/gerrit/19613
Reviewed-by: Andrew de los Reyes <adlr@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>

libcurl_http_fetcher.cc

diff --git a/libcurl_http_fetcher.cc b/libcurl_http_fetcher.cc
index b9da3a7..abc4389 100644
--- a/libcurl_http_fetcher.cc
+++ b/libcurl_http_fetcher.cc
@@ -65,8 +65,9 @@
   CHECK(curl_handle_);
 
   CHECK(HasProxy());
-  LOG(INFO) << "Using proxy: " << GetCurrentProxy();
-  if (GetCurrentProxy() == kNoProxy) {
+  bool is_direct = (GetCurrentProxy() == kNoProxy);
+  LOG(INFO) << "Using proxy: " << (is_direct ? "no" : "yes");
+  if (is_direct) {
     CHECK_EQ(curl_easy_setopt(curl_handle_,
                               CURLOPT_PROXY,
                               ""), CURLE_OK);
@@ -295,7 +296,7 @@
 
       if (HasProxy()) {
         // We have another proxy. Retry immediately.
-        LOG(INFO) << "Trying next proxy: " << GetCurrentProxy();
+        LOG(INFO) << "Retrying with next proxy setting";
         g_idle_add(&LibcurlHttpFetcher::StaticRetryTimeoutCallback, this);
       } else {
         // Out of proxies. Give up.