From 5b04a57ab2fcfea24ebe8935132f713532af8b9f Mon Sep 17 00:00:00 2001
From: Andrii Shyshkalov <tandrii@chromium.org>
Date: Mon, 23 Jan 2017 17:44:41 +0100
Subject: [PATCH] git cl + gerrit_util: improve diagnostic logging.

BUG=681704

Change-Id: I1a774350aea901d4e9f2468cff111cbbcd7f3388
Reviewed-on: https://chromium-review.googlesource.com/430794
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
---
 gerrit_util.py | 18 +++++++++---------
 git_cl.py      |  5 ++++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/gerrit_util.py b/gerrit_util.py
index ef7edc11d..aa3740b85 100755
--- a/gerrit_util.py
+++ b/gerrit_util.py
@@ -183,7 +183,7 @@ class CookiesAuthenticator(Authenticator):
             login, secret_token = value.split('=', 1)
             gitcookies[domain] = (login, secret_token)
         except (IndexError, ValueError, TypeError) as exc:
-          logging.warning(exc)
+          LOGGER.warning(exc)
 
     return gitcookies
 
@@ -346,17 +346,18 @@ def ReadHttpResponse(conn, expect_status=200, ignore_404=True):
 
     # If response.status < 500 then the result is final; break retry loop.
     if response.status < 500:
+      LOGGER.debug('got response %d for %s %s', response.status,
+                   conn.req_params['method'], conn.req_params['url'])
       break
     # A status >=500 is assumed to be a possible transient error; retry.
     http_version = 'HTTP/%s' % ('1.1' if response.version == 11 else '1.0')
-    msg = (
-        'A transient error occurred while querying %s:\n'
-        '%s %s %s\n'
-        '%s %d %s' % (
-            conn.host, conn.req_params['method'], conn.req_params['url'],
-            http_version, http_version, response.status, response.reason))
+    LOGGER.warn('A transient error occurred while querying %s:\n'
+                '%s %s %s\n'
+                '%s %d %s',
+                conn.host, conn.req_params['method'], conn.req_params['url'],
+                http_version, http_version, response.status, response.reason)
     if TRY_LIMIT - idx > 1:
-      msg += '\n... will retry %d more times.' % (TRY_LIMIT - idx - 1)
+      LOGGER.warn('... will retry %d more times.', TRY_LIMIT - idx - 1)
       time.sleep(sleep_time)
       sleep_time = sleep_time * 2
       req_host = conn.req_host
@@ -365,7 +366,6 @@ def ReadHttpResponse(conn, expect_status=200, ignore_404=True):
       conn.req_host = req_host
       conn.req_params = req_params
       conn.request(**req_params)
-    LOGGER.warn(msg)
   if ignore_404 and response.status == 404:
     return StringIO()
   if response.status != expect_status:
diff --git a/git_cl.py b/git_cl.py
index 1a627940a..f18166f9c 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -5386,7 +5386,10 @@ class OptionParser(optparse.OptionParser):
   def parse_args(self, args=None, values=None):
     options, args = optparse.OptionParser.parse_args(self, args, values)
     levels = [logging.WARNING, logging.INFO, logging.DEBUG]
-    logging.basicConfig(level=levels[min(options.verbose, len(levels) - 1)])
+    logging.basicConfig(
+        level=levels[min(options.verbose, len(levels) - 1)],
+        format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
+               '%(filename)s] %(message)s')
     return options, args