From 2161b4be08f2b295f68e2f7c0f9c791919542a39 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 29 Oct 2013 15:38:11 -0400 Subject: Core: Make core object available at the module level --- src/lib/Bcfg2/Server/Core.py | 6 +++--- src/lib/Bcfg2/Server/__init__.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/lib/Bcfg2') diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 796cd8bcc..85760aac3 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -93,11 +93,11 @@ class DefaultACL(Plugin, ClientACLs): rmi != 'get_statistics') or address[0] == "127.0.0.1") - # in core we frequently want to catch all exceptions, regardless of # type, so disable the pylint rule that catches that. # pylint: disable=W0702 + class Core(object): """ The server core is the container for all Bcfg2 server logic and modules. All core implementations must inherit from @@ -130,8 +130,8 @@ class Core(object): .. automethod:: _file_monitor_thread .. automethod:: _perflog_thread """ - global _CORE - _CORE = self + # Record the core as a module variable + Bcfg2.Server.core = self #: A :class:`logging.Logger` object for use by the core self.logger = logging.getLogger('bcfg2-server') diff --git a/src/lib/Bcfg2/Server/__init__.py b/src/lib/Bcfg2/Server/__init__.py index bf8d0191d..4e46ada09 100644 --- a/src/lib/Bcfg2/Server/__init__.py +++ b/src/lib/Bcfg2/Server/__init__.py @@ -1,9 +1,12 @@ """This is the set of modules for Bcfg2.Server.""" import lxml.etree +import Bcfg2.Options XI = 'http://www.w3.org/2001/XInclude' XI_NAMESPACE = '{%s}' % XI # pylint: disable=C0103 XMLParser = lxml.etree.XMLParser(remove_blank_text=True) + +core = None -- cgit v1.2.3-1-g7c22