netcmd: Add Command.get_logger() method.

diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py
index 3acd1022bfdf2bf6bdd1f9ce8741a5e8be280997..49e03800d681ac28459b725a27ae6690c22e6c88 100644 (file)
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/source4/scripting/python/samba/netcmd/__init__.py
@@ -141,6 +141,12 @@ class Command(object):
         """Run the command. This should be overriden by all subclasses."""
         raise NotImplementedError(self.run)
 
+    def get_logger(self, name="netcmd"):
+        """Get a logger object."""
+        import logging
+        logger = logging.getLogger(name)
+        logger.addHandler(logging.StreamHandler(self.outf))
+        return logger
 
 
 class SuperCommand(Command):

diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index f1125b2ce422d424b2d25dcc8928d5042b291a7b..05e82b5dfa879d9fd7e5c529425ca5c6a9d30784 100644 (file)
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -573,8 +573,7 @@ samba3 testparm utility (with --testparm)."""
             self.outf.write("warning: both libdir and testparm specified, ignoring libdir.\n")
             libdir = None
 
-        logger = logging.getLogger("upgrade")
-        logger.addHandler(logging.StreamHandler(sys.stdout))
+        logger = self.get_logger()
         if quiet:
             logger.setLevel(logging.WARNING)
         else:

diff --git a/source4/scripting/python/samba/netcmd/testparm.py b/source4/scripting/python/samba/netcmd/testparm.py
index 08d21721c70ccc708022429dafd717f72c39e8cf..b9979770e60ccbccbe0fbe7075cdc04bfe9b78fe 100755 (executable)
--- a/source4/scripting/python/samba/netcmd/testparm.py
+++ b/source4/scripting/python/samba/netcmd/testparm.py
@@ -36,7 +36,6 @@
 
 import os
 import sys
-import logging
 
 import samba
 import samba.getopt as options
@@ -93,8 +92,7 @@ class cmd_testparm(Command):
         # We need this to force the output
         samba.set_debug_level(2)
 
-        logger = logging.getLogger("testparm")
-        logger.addHandler(logging.StreamHandler(sys.stdout))
+        logger = self.get_logger("testparm")
 
         logger.info("Loaded smb config files from %s", lp.configfile)
         logger.info("Loaded services file OK.")