From 047cb6849354f4fdf8d365bd109a0ed56a77d200 Mon Sep 17 00:00:00 2001
From: Tang Chen <chen.tang@easystack.cn>
Date: Thu, 16 Jun 2016 20:01:15 +0800
Subject: Standardize logger usage

Use file logger for all command specific logs.

This patch also fixes some usage that doesn't
follow rules in:
http://docs.openstack.org/developer/oslo.i18n/guidelines.html

After this patch, all self.log and self.app.log
will be standardized to LOG().

NOTE: In shell.py, we got the log in class OpenStackShell,
      which is also known as self.app.log in other classes.
      This logger is used to record non-command-specific logs.
      So we leave it as-is.

Change-Id: I114f73ee6c7e84593d71e724bc1ad00d343c1896
Implements: blueprint log-usage
---
 openstackclient/common/availability_zone.py | 20 ++++++++++++--------
 openstackclient/common/extension.py         | 21 +++++++++++++--------
 2 files changed, 25 insertions(+), 16 deletions(-)

(limited to 'openstackclient/common')

diff --git a/openstackclient/common/availability_zone.py b/openstackclient/common/availability_zone.py
index af161d1f..89d77d15 100644
--- a/openstackclient/common/availability_zone.py
+++ b/openstackclient/common/availability_zone.py
@@ -14,6 +14,7 @@
 """Availability Zone action implementations"""
 
 import copy
+import logging
 
 from novaclient import exceptions as nova_exceptions
 from osc_lib.command import command
@@ -23,6 +24,9 @@ import six
 from openstackclient.i18n import _
 
 
+LOG = logging.getLogger(__name__)
+
+
 def _xform_common_availability_zone(az, zone_info):
     if hasattr(az, 'zoneState'):
         zone_info['zone_status'] = ('available' if az.zoneState['available']
@@ -136,11 +140,11 @@ class ListAvailabilityZone(command.Lister):
         try:
             data = volume_client.availability_zones.list()
         except Exception as e:
-            self.log.debug('Volume availability zone exception: ' + str(e))
+            LOG.debug('Volume availability zone exception: %s', e)
             if parsed_args.volume:
-                message = "Availability zones list not supported by " \
-                          "Block Storage API"
-                self.log.warning(message)
+                message = _("Availability zones list not supported by "
+                            "Block Storage API")
+                LOG.warning(message)
 
         result = []
         for zone in data:
@@ -154,11 +158,11 @@ class ListAvailabilityZone(command.Lister):
             network_client.find_extension('Availability Zone',
                                           ignore_missing=False)
         except Exception as e:
-            self.log.debug('Network availability zone exception: ' + str(e))
+            LOG.debug('Network availability zone exception: ', e)
             if parsed_args.network:
-                message = "Availability zones list not supported by " \
-                          "Network API"
-                self.log.warning(message)
+                message = _("Availability zones list not supported by "
+                            "Network API")
+                LOG.warning(message)
             return []
 
         result = []
diff --git a/openstackclient/common/extension.py b/openstackclient/common/extension.py
index 327fc223..de480016 100644
--- a/openstackclient/common/extension.py
+++ b/openstackclient/common/extension.py
@@ -16,6 +16,7 @@
 """Extension action implementations"""
 
 import itertools
+import logging
 
 from osc_lib.command import command
 from osc_lib import utils
@@ -23,6 +24,9 @@ from osc_lib import utils
 from openstackclient.i18n import _
 
 
+LOG = logging.getLogger(__name__)
+
+
 class ListExtension(command.Lister):
     """List API extensions"""
 
@@ -80,24 +84,25 @@ class ListExtension(command.Lister):
             try:
                 data += identity_client.extensions.list()
             except Exception:
-                message = "Extensions list not supported by Identity API"
-                self.log.warning(message)
+                message = _("Extensions list not supported by Identity API")
+                LOG.warning(message)
 
         if parsed_args.compute or show_all:
             compute_client = self.app.client_manager.compute
             try:
                 data += compute_client.list_extensions.show_all()
             except Exception:
-                message = "Extensions list not supported by Compute API"
-                self.log.warning(message)
+                message = _("Extensions list not supported by Compute API")
+                LOG.warning(message)
 
         if parsed_args.volume or show_all:
             volume_client = self.app.client_manager.volume
             try:
                 data += volume_client.list_extensions.show_all()
             except Exception:
-                message = "Extensions list not supported by Block Storage API"
-                self.log.warning(message)
+                message = _("Extensions list not supported by "
+                            "Block Storage API")
+                LOG.warning(message)
 
         # Resource classes for the above
         extension_tuples = (
@@ -125,7 +130,7 @@ class ListExtension(command.Lister):
                     dict_tuples
                 )
             except Exception:
-                message = "Extensions list not supported by Network API"
-                self.log.warning(message)
+                message = _("Extensions list not supported by Network API")
+                LOG.warning(message)
 
         return (columns, extension_tuples)
-- 
cgit v1.2.1