summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-23 15:27:06 +0000
committerGerrit Code Review <review@openstack.org>2016-06-23 15:27:06 +0000
commit29dd2b12df4616d14746af5c32d8fe676006ec30 (patch)
tree28bbc4399cde85a1a8af63009e36a3d9c9c2e48b /openstackclient
parent45f355b66c822fd608b4085c3c536c7f52e0b219 (diff)
parente8483c90229fbb40408358ff307402469e12c26f (diff)
downloadpython-openstackclient-29dd2b12df4616d14746af5c32d8fe676006ec30.tar.gz
Merge "Standardize logger usage of catalog in identity"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/identity/v2_0/catalog.py8
-rw-r--r--openstackclient/identity/v3/catalog.py8
2 files changed, 12 insertions, 4 deletions
diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
index 62e6b1f9..7a15cf3a 100644
--- a/openstackclient/identity/v2_0/catalog.py
+++ b/openstackclient/identity/v2_0/catalog.py
@@ -13,6 +13,8 @@
"""Identity v2 Service Catalog action implementations"""
+import logging
+
from osc_lib.command import command
from osc_lib import exceptions
from osc_lib import utils
@@ -21,6 +23,9 @@ import six
from openstackclient.i18n import _
+LOG = logging.getLogger(__name__)
+
+
def _format_endpoints(eps=None):
if not eps:
return ""
@@ -92,8 +97,7 @@ class ShowCatalog(command.ShowOne):
break
if not data:
- self.app.log.error(_('service %s not found\n') %
- parsed_args.service)
+ LOG.error(_('service %s not found\n'), parsed_args.service)
return ((), ())
return zip(*sorted(six.iteritems(data)))
diff --git a/openstackclient/identity/v3/catalog.py b/openstackclient/identity/v3/catalog.py
index a6e141c9..a62d0a93 100644
--- a/openstackclient/identity/v3/catalog.py
+++ b/openstackclient/identity/v3/catalog.py
@@ -13,6 +13,8 @@
"""Identity v3 Service Catalog action implementations"""
+import logging
+
from osc_lib.command import command
from osc_lib import exceptions
from osc_lib import utils
@@ -21,6 +23,9 @@ import six
from openstackclient.i18n import _
+LOG = logging.getLogger(__name__)
+
+
def _format_endpoints(eps=None):
if not eps:
return ""
@@ -87,8 +92,7 @@ class ShowCatalog(command.ShowOne):
break
if not data:
- self.app.log.error(_('service %s not found\n') %
- parsed_args.service)
+ LOG.error(_('service %s not found\n'), parsed_args.service)
return ((), ())
return zip(*sorted(six.iteritems(data)))