Skip to content

Commit 29dd2b1

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Standardize logger usage of catalog in identity"
2 parents 45f355b + e8483c9 commit 29dd2b1

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

openstackclient/identity/v2_0/catalog.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
"""Identity v2 Service Catalog action implementations"""
1515

16+
import logging
17+
1618
from osc_lib.command import command
1719
from osc_lib import exceptions
1820
from osc_lib import utils
@@ -21,6 +23,9 @@
2123
from openstackclient.i18n import _
2224

2325

26+
LOG = logging.getLogger(__name__)
27+
28+
2429
def _format_endpoints(eps=None):
2530
if not eps:
2631
return ""
@@ -92,8 +97,7 @@ def take_action(self, parsed_args):
9297
break
9398

9499
if not data:
95-
self.app.log.error(_('service %s not found\n') %
96-
parsed_args.service)
100+
LOG.error(_('service %s not found\n'), parsed_args.service)
97101
return ((), ())
98102

99103
return zip(*sorted(six.iteritems(data)))

openstackclient/identity/v3/catalog.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
"""Identity v3 Service Catalog action implementations"""
1515

16+
import logging
17+
1618
from osc_lib.command import command
1719
from osc_lib import exceptions
1820
from osc_lib import utils
@@ -21,6 +23,9 @@
2123
from openstackclient.i18n import _
2224

2325

26+
LOG = logging.getLogger(__name__)
27+
28+
2429
def _format_endpoints(eps=None):
2530
if not eps:
2631
return ""
@@ -87,8 +92,7 @@ def take_action(self, parsed_args):
8792
break
8893

8994
if not data:
90-
self.app.log.error(_('service %s not found\n') %
91-
parsed_args.service)
95+
LOG.error(_('service %s not found\n'), parsed_args.service)
9296
return ((), ())
9397

9498
return zip(*sorted(six.iteritems(data)))

0 commit comments

Comments
 (0)