Bugzilla: Tweak URL logging a bit

crobinso · crobinso · commit 5db4ea21bef7 · 2020-01-13T11:06:51.000-05:00
Because we call fix_url multiple times internally, the logging
there is noisy. Instead centralize relevant logging in connect()

Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/_cli.py b/bugzilla/_cli.py
@@ -1104,9 +1104,6 @@ def _main(unittest_bz_instance):
     log.debug("Launched with command line: %s", " ".join(sys.argv))
     log.debug("Bugzilla module: %s", bugzilla)
 
-    # Connect to bugzilla
-    log.info('Connecting to %s', opt.bugzilla)
-
     if unittest_bz_instance:
         bz = unittest_bz_instance
     else:
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -143,7 +143,6 @@ def fix_url(url, force_rest=False):
         """
         scheme, netloc, path, params, query, fragment = urlparse(url)
         if not scheme:
-            log.debug('No scheme given for url, assuming https')
             scheme = 'https'
 
         if path and not netloc:
@@ -154,11 +153,8 @@ def fix_url(url, force_rest=False):
             path = 'xmlrpc.cgi'
             if force_rest:
                 path = "rest/"
-            log.debug('No path given for url, assuming /%s', path)
 
         newurl = urlunparse((scheme, netloc, path, params, query, fragment))
-        if newurl != url:
-            log.debug("Generated fixed URL: %s", newurl)
         return newurl
 
     @staticmethod
@@ -499,19 +495,24 @@ def connect(self, url=None):
         if self._session:
             self.disconnect()
 
-        backendclass, url = self._get_backend_class(url or self.url)
-        self.url = url
+        url = url or self.url
+        backendclass, newurl = self._get_backend_class(url)
+        if url != newurl:
+            log.debug("Converted url=%s to fixed url=%s", url, newurl)
+        self.url = newurl
+        log.debug("Connecting with URL %s", self.url)
+
         # we've changed URLs - reload config
         self.readconfig(overwrite=False)
 
-        self._session = _BugzillaSession(url, self.user_agent,
+        self._session = _BugzillaSession(self.url, self.user_agent,
                 cookiecache=self._cookiecache,
                 sslverify=self._sslverify,
                 cert=self.cert,
                 tokencache=self._tokencache,
                 api_key=self.api_key,
                 requests_session=self._user_requests_session)
-        self._backend = backendclass(url, self._session)
+        self._backend = backendclass(self.url, self._session)
 
         if (self.user and self.password):
             log.info("user and password present - doing login()")
