From 258c1102cc6b93a860bcd7cc083d4e14ae0025ce Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <motoki@da.jp.nec.com>
Date: Sun, 10 Jan 2016 21:54:53 +0900
Subject: log take_action parameters in a single place

Previously each command logs take_action parameters explicitly
by using @utils.log_method decorator or log.debug().
Some commands have no logging.

This commit calls a logger in the base class and
drops all logging definition from individual commands.

Closes-Bug: #1532294
Change-Id: I43cd0290a4353c68c075bade9571c940733da1be
---
 openstackclient/object/v1/object.py | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

(limited to 'openstackclient/object/v1/object.py')

diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py
index 4bd06124..f9a55e9c 100644
--- a/openstackclient/object/v1/object.py
+++ b/openstackclient/object/v1/object.py
@@ -16,22 +16,16 @@
 """Object v1 action implementations"""
 
 
-import logging
 import six
 
-from cliff import command
-from cliff import lister
-from cliff import show
-
+from openstackclient.common import command
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 
 
-class CreateObject(lister.Lister):
+class CreateObject(command.Lister):
     """Upload object to container"""
 
-    log = logging.getLogger(__name__ + '.CreateObject')
-
     def get_parser(self, prog_name):
         parser = super(CreateObject, self).get_parser(prog_name)
         parser.add_argument(
@@ -47,7 +41,6 @@ class CreateObject(lister.Lister):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
 
         results = []
@@ -69,8 +62,6 @@ class CreateObject(lister.Lister):
 class DeleteObject(command.Command):
     """Delete object from container"""
 
-    log = logging.getLogger(__name__ + '.DeleteObject')
-
     def get_parser(self, prog_name):
         parser = super(DeleteObject, self).get_parser(prog_name)
         parser.add_argument(
@@ -86,7 +77,6 @@ class DeleteObject(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
 
         for obj in parsed_args.objects:
@@ -96,11 +86,9 @@ class DeleteObject(command.Command):
             )
 
 
-class ListObject(lister.Lister):
+class ListObject(command.Lister):
     """List objects"""
 
-    log = logging.getLogger(__name__ + '.ListObject')
-
     def get_parser(self, prog_name):
         parser = super(ListObject, self).get_parser(prog_name)
         parser.add_argument(
@@ -148,7 +136,6 @@ class ListObject(lister.Lister):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
 
         if parsed_args.long:
@@ -191,8 +178,6 @@ class ListObject(lister.Lister):
 class SaveObject(command.Command):
     """Save object locally"""
 
-    log = logging.getLogger(__name__ + ".SaveObject")
-
     def get_parser(self, prog_name):
         parser = super(SaveObject, self).get_parser(prog_name)
         parser.add_argument(
@@ -213,8 +198,6 @@ class SaveObject(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
-
         self.app.client_manager.object_store.object_save(
             container=parsed_args.container,
             object=parsed_args.object,
@@ -225,8 +208,6 @@ class SaveObject(command.Command):
 class SetObject(command.Command):
     """Set object properties"""
 
-    log = logging.getLogger(__name__ + '.SetObject')
-
     def get_parser(self, prog_name):
         parser = super(SetObject, self).get_parser(prog_name)
         parser.add_argument(
@@ -249,7 +230,6 @@ class SetObject(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         self.app.client_manager.object_store.object_set(
             parsed_args.container,
@@ -258,11 +238,9 @@ class SetObject(command.Command):
         )
 
 
-class ShowObject(show.ShowOne):
+class ShowObject(command.ShowOne):
     """Display object details"""
 
-    log = logging.getLogger(__name__ + '.ShowObject')
-
     def get_parser(self, prog_name):
         parser = super(ShowObject, self).get_parser(prog_name)
         parser.add_argument(
@@ -277,7 +255,6 @@ class ShowObject(show.ShowOne):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
 
         data = self.app.client_manager.object_store.object_show(
@@ -293,8 +270,6 @@ class ShowObject(show.ShowOne):
 class UnsetObject(command.Command):
     """Unset object properties"""
 
-    log = logging.getLogger(__name__ + '.UnsetObject')
-
     def get_parser(self, prog_name):
         parser = super(UnsetObject, self).get_parser(prog_name)
         parser.add_argument(
@@ -318,7 +293,6 @@ class UnsetObject(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         self.app.client_manager.object_store.object_unset(
             parsed_args.container,
-- 
cgit v1.2.1