Merge "Extract logging config into a helper function"

shade/__init__.py

@@ -50,6 +50,7 @@ from shade import task_manager
 from shade import _tasks
 from shade import _utils
 
+
 __version__ = pbr.version.VersionInfo('shade').version_string()
 OBJECT_MD5_KEY = 'x-object-meta-x-shade-md5'
 OBJECT_SHA256_KEY = 'x-object-meta-x-shade-sha256'
@@ -89,6 +90,16 @@ def valid_kwargs(*valid_args):
     return func_wrapper
 
 
+def simple_logging(debug=False):
+    if debug:
+        log_level = logging.DEBUG
+    else:
+        log_level = logging.INFO
+    log = logging.getLogger('shade')
+    log.addHandler(logging.StreamHandler())
+    log.setLevel(log_level)
+
+
 def openstack_clouds(config=None, debug=False):
     if not config:
         config = os_client_config.OpenStackConfig()
@@ -214,8 +225,7 @@ class OpenStackCloud(object):
     :param string cert: A path to a client certificate to pass to requests.
                         (optional)
     :param string key: A path to a client key to pass to requests. (optional)
-    :param bool debug: Enable or disable debug logging (optional, defaults to
-                       False)
+    :param bool debug: Deprecated and unused parameter.
     :param int cache_interval: How long to cache items fetched from the cloud.
                                Value will be passed to dogpile.cache. None
                                means do not cache at all.
@@ -248,6 +258,8 @@ class OpenStackCloud(object):
                  image_api_use_tasks=False,
                  **kwargs):
 
+        self.log = logging.getLogger('shade')
+
         self.name = cloud
         self.auth = auth
         self.region_name = region_name
@@ -292,13 +304,6 @@ class OpenStackCloud(object):
         self._swift_service = None
         self._trove_client = None
 
-        self.log = logging.getLogger('shade')
-        log_level = logging.INFO
-        if debug:
-            log_level = logging.DEBUG
-        self.log.setLevel(log_level)
-        self.log.addHandler(logging.StreamHandler())
-
     def _make_cache_key(self, namespace, fn):
         fname = fn.__name__
         if namespace is None:
@@ -350,11 +355,6 @@ class OpenStackCloud(object):
     @property
     def keystone_session(self):
         if self._keystone_session is None:
-            # keystoneclient does crazy things with logging that are
-            # none of them interesting
-            keystone_logging = logging.getLogger('keystoneclient')
-            keystone_logging.addHandler(logging.NullHandler())
-
             try:
                 auth_plugin = ksc_auth.get_plugin_class(self.auth_type)
             except Exception as e:
@@ -2488,8 +2488,6 @@ class OperatorCloud(OpenStackCloud):
     @property
     def ironic_client(self):
         if self._ironic_client is None:
-            ironic_logging = logging.getLogger('ironicclient')
-            ironic_logging.addHandler(logging.NullHandler())
             token = self.auth_token
             if self.auth_type in (None, "None", ''):
                 # TODO: This needs to be improved logic wise, perhaps a list,