applied logging->logger patch

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4852 ce84e21b-d406-0410-9b95-82705330c041

8 files changed, 14 insertions, 14 deletions

diff --git a/src/lib/Logging.py b/src/lib/Logger.py
index 429538090..429538090 100644
--- a/src/lib/Logging.py
+++ b/src/lib/Logger.py
diff --git a/src/lib/Server/Admin/Query.py b/src/lib/Server/Admin/Query.py
index 999bde5c2..67484083d 100644
--- a/src/lib/Server/Admin/Query.py
+++ b/src/lib/Server/Admin/Query.py
@@ -1,11 +1,11 @@
-import Bcfg2.Server.Admin, Bcfg2.Logging, logging
+import Bcfg2.Server.Admin, Bcfg2.Logger, logging
 
 class Query(Bcfg2.Server.Admin.Mode):
     __shorthelp__ = 'bcfg2-admin query [-n] [-c] [-f filename] g=group p=profile'
     __longhelp__ = __shorthelp__ + '\n\tQuery clients'
     def __init__(self, cfile):
         logging.root.setLevel(100)
-        Bcfg2.Logging.setup_logging(100, to_console=False, to_syslog=False)
+        Bcfg2.Logger.setup_logging(100, to_console=False, to_syslog=False)
         Bcfg2.Server.Admin.Mode.__init__(self, cfile)
         try:
             self.bcore = Bcfg2.Server.Core.Core(self.get_repo_path(), [],
diff --git a/src/lib/__init__.py b/src/lib/__init__.py
index 7f771da6f..a6300af89 100644
--- a/src/lib/__init__.py
+++ b/src/lib/__init__.py
@@ -1,4 +1,4 @@
 '''base modules definition'''
 __revision__ = '$Revision$'
 
-__all__ = ['Server', 'Client', 'Component', 'Logging', 'Options', 'Proxy']
+__all__ = ['Server', 'Client', 'Component', 'Logger', 'Options', 'Proxy']
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 4757c129d..6f7612b0b 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -21,7 +21,7 @@ from Bcfg2.Component import SimpleXMLRPCServer, ComponentInitError, ComponentKey
 from Bcfg2.tlslite.errors import TLSNoAuthenticationError, TLSFingerprintError
 
 import Bcfg2.Proxy
-import Bcfg2.Logging
+import Bcfg2.Logger
 
 logger = logging.getLogger('bcfg2')
 
@@ -134,7 +134,7 @@ class Client:
             level = 20
         if self.setup['debug']:
             level = 0
-        Bcfg2.Logging.setup_logging('bcfg2', to_syslog=False, level=level)
+        Bcfg2.Logger.setup_logging('bcfg2', to_syslog=False, level=level)
         self.logger = logging.getLogger('bcfg2')
         self.logger.debug(self.setup)
         if 'drivers' in self.setup and self.setup['drivers'] == 'help':
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index bb44bbc3f..1cc8ca288 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -2,7 +2,7 @@
 '''bcfg2-admin is a script that helps to administrate a bcfg2 deployment'''
 
 import getopt, logging, sys
-import Bcfg2.Server.Core, Bcfg2.Logging, Bcfg2.Options
+import Bcfg2.Server.Core, Bcfg2.Logger, Bcfg2.Options
 
 log = logging.getLogger('bcfg-admin')
 
@@ -16,7 +16,7 @@ def mode_import(modename):
     return getattr(mod, modname)
 
 if __name__ == '__main__':
-    Bcfg2.Logging.setup_logging('bcfg2-admin', to_console=True)
+    Bcfg2.Logger.setup_logging('bcfg2-admin', to_console=True)
     # Get config file path
     configfile = Bcfg2.Options.CFILE.default
     try:
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index a7163a5fb..96da82bf7 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -3,7 +3,7 @@
 __revision__ = '$Revision$'
 
 import copy, logging, lxml.etree, sys, time, cmd
-import Bcfg2.Logging, Bcfg2.Server.Core, os
+import Bcfg2.Logger, Bcfg2.Server.Core, os
 import Bcfg2.Server.Plugins.Metadata, Bcfg2.Server.Plugin
 import Bcfg2.Options
 
@@ -289,7 +289,7 @@ Usage: [quit|exit]"""
                     print cand[0].name
 
 if __name__ == '__main__':
-    Bcfg2.Logging.setup_logging('bcfg2-info', to_syslog=False)
+    Bcfg2.Logger.setup_logging('bcfg2-info', to_syslog=False)
     optinfo = {
             'configfile': Bcfg2.Options.CFILE, 
             'help': Bcfg2.Options.HELP,
diff --git a/src/sbin/bcfg2-remote b/src/sbin/bcfg2-remote
index c33fcfbfe..ee52d6201 100755
--- a/src/sbin/bcfg2-remote
+++ b/src/sbin/bcfg2-remote
@@ -4,7 +4,7 @@ __revision__ = '$Revision$'
 from Bcfg2.tlslite.api import parsePEMKey, X509, X509CertChain
 from xmlrpclib import ServerProxy
 from Bcfg2.tlslite.integration.XMLRPCTransport import XMLRPCTransport
-import Bcfg2.Options, Bcfg2.Logging, logging, socket, sys
+import Bcfg2.Options, Bcfg2.Logger, logging, socket, sys
 
 if __name__ == '__main__':
     opts = {
@@ -16,7 +16,7 @@ if __name__ == '__main__':
         }
     setup = Bcfg2.Options.OptionParser(opts)
     setup.parse(sys.argv[1:])
-    Bcfg2.Logging.setup_logging('bcfg2-remote',
+    Bcfg2.Logger.setup_logging('bcfg2-remote',
                                 to_syslog=False,
                                 level=int(setup['debug']))
     logger = logging.getLogger('bcfg2-remote')
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 18091d55c..d58c8b45e 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -10,7 +10,7 @@ from xmlrpclib import Fault
 from lxml.etree import XML, Element, tostring
 
 import logging, select, socket, sys
-import Bcfg2.Logging, Bcfg2.Options, Bcfg2.Component, Bcfg2.Daemon
+import Bcfg2.Logger, Bcfg2.Options, Bcfg2.Component, Bcfg2.Daemon
 
 logger = logging.getLogger('bcfg2-server')
 
@@ -217,10 +217,10 @@ if __name__ == '__main__':
 
     level = 0
     if setup['daemon']:
-        Bcfg2.Logging.setup_logging('bcfg2-server', to_console=False, level=level)
+        Bcfg2.Logger.setup_logging('bcfg2-server', to_console=False, level=level)
         Bcfg2.Daemon.daemonize(setup['daemon'])
     else:
-        Bcfg2.Logging.setup_logging('bcfg2-server', level=level)
+        Bcfg2.Logger.setup_logging('bcfg2-server', level=level)
 
     if not setup['key']:
         print "No key specified in '%s'" % setup['configfile']