diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-11-03 20:27:01 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-11-03 20:27:01 +0000 |
commit | 0f0449cdf22383c5e27e6e476ad62edc64c4638b (patch) | |
tree | 418dda82ffe200182f09d9ff6595a0e79db546dd | |
parent | ae5023054dbdffd0a6c72db6e1f4a153db46090d (diff) | |
parent | 335ed4a6944ad32759ad810aa6a4da599bc358fd (diff) | |
download | os-client-config-0f0449cdf22383c5e27e6e476ad62edc64c4638b.tar.gz |
Merge "Add logging module support"
-rw-r--r-- | os_client_config/_log.py | 28 | ||||
-rw-r--r-- | os_client_config/cloud_config.py | 2 |
2 files changed, 30 insertions, 0 deletions
diff --git a/os_client_config/_log.py b/os_client_config/_log.py new file mode 100644 index 0000000..ff2f2ea --- /dev/null +++ b/os_client_config/_log.py @@ -0,0 +1,28 @@ +# Copyright (c) 2015 IBM Corp. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import logging + + +class NullHandler(logging.Handler): + def emit(self, record): + pass + + +def setup_logging(name): + log = logging.getLogger(name) + if len(log.handlers) == 0: + h = NullHandler() + log.addHandler(h) + return log diff --git a/os_client_config/cloud_config.py b/os_client_config/cloud_config.py index 6085a64..fe5c302 100644 --- a/os_client_config/cloud_config.py +++ b/os_client_config/cloud_config.py @@ -17,6 +17,7 @@ import warnings from keystoneauth1 import plugin from keystoneauth1 import session +from os_client_config import _log from os_client_config import exceptions @@ -27,6 +28,7 @@ class CloudConfig(object): self.name = name self.region = region self.config = config + self.log = _log.setup_logging(__name__) self._force_ipv4 = force_ipv4 self._auth = auth_plugin self._openstack_config = openstack_config |