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/container.py | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

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

diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py
index 8c8844e2..e70afd9d 100644
--- a/openstackclient/object/v1/container.py
+++ b/openstackclient/object/v1/container.py
@@ -16,22 +16,16 @@
 """Container 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 CreateContainer(lister.Lister):
+class CreateContainer(command.Lister):
     """Create new container"""
 
-    log = logging.getLogger(__name__ + '.CreateContainer')
-
     def get_parser(self, prog_name):
         parser = super(CreateContainer, self).get_parser(prog_name)
         parser.add_argument(
@@ -42,7 +36,6 @@ class CreateContainer(lister.Lister):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
 
         results = []
@@ -63,8 +56,6 @@ class CreateContainer(lister.Lister):
 class DeleteContainer(command.Command):
     """Delete container"""
 
-    log = logging.getLogger(__name__ + '.DeleteContainer')
-
     def get_parser(self, prog_name):
         parser = super(DeleteContainer, self).get_parser(prog_name)
         parser.add_argument(
@@ -75,7 +66,6 @@ class DeleteContainer(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
 
         for container in parsed_args.containers:
@@ -84,11 +74,9 @@ class DeleteContainer(command.Command):
             )
 
 
-class ListContainer(lister.Lister):
+class ListContainer(command.Lister):
     """List containers"""
 
-    log = logging.getLogger(__name__ + '.ListContainer')
-
     def get_parser(self, prog_name):
         parser = super(ListContainer, self).get_parser(prog_name)
         parser.add_argument(
@@ -126,7 +114,6 @@ class ListContainer(lister.Lister):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
 
         if parsed_args.long:
@@ -160,8 +147,6 @@ class ListContainer(lister.Lister):
 class SaveContainer(command.Command):
     """Save container contents locally"""
 
-    log = logging.getLogger(__name__ + ".SaveContainer")
-
     def get_parser(self, prog_name):
         parser = super(SaveContainer, self).get_parser(prog_name)
         parser.add_argument(
@@ -172,8 +157,6 @@ class SaveContainer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
-
         self.app.client_manager.object_store.container_save(
             container=parsed_args.container,
         )
@@ -182,8 +165,6 @@ class SaveContainer(command.Command):
 class SetContainer(command.Command):
     """Set container properties"""
 
-    log = logging.getLogger(__name__ + '.SetContainer')
-
     def get_parser(self, prog_name):
         parser = super(SetContainer, self).get_parser(prog_name)
         parser.add_argument(
@@ -201,7 +182,6 @@ class SetContainer(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         self.app.client_manager.object_store.container_set(
             parsed_args.container,
@@ -209,11 +189,9 @@ class SetContainer(command.Command):
         )
 
 
-class ShowContainer(show.ShowOne):
+class ShowContainer(command.ShowOne):
     """Display container details"""
 
-    log = logging.getLogger(__name__ + '.ShowContainer')
-
     def get_parser(self, prog_name):
         parser = super(ShowContainer, self).get_parser(prog_name)
         parser.add_argument(
@@ -223,7 +201,6 @@ class ShowContainer(show.ShowOne):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
 
         data = self.app.client_manager.object_store.container_show(
@@ -238,8 +215,6 @@ class ShowContainer(show.ShowOne):
 class UnsetContainer(command.Command):
     """Unset container properties"""
 
-    log = logging.getLogger(__name__ + '.UnsetContainer')
-
     def get_parser(self, prog_name):
         parser = super(UnsetContainer, self).get_parser(prog_name)
         parser.add_argument(
@@ -258,7 +233,6 @@ class UnsetContainer(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         self.app.client_manager.object_store.container_unset(
             parsed_args.container,
-- 
cgit v1.2.1