Merge branch 'options-rewrite'

Conflicts:
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Init.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/MultiprocessingCore.py
	src/lib/Bcfg2/Server/Plugin/base.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
	src/lib/Bcfg2/Server/SSLServer.py
	src/lib/Bcfg2/Utils.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-info
	src/sbin/bcfg2-lint
	src/sbin/bcfg2-test
	src/sbin/bcfg2-yum-helper
	tools/bcfg2-profile-templates.py

1 files changed, 1 insertions, 57 deletions

diff --git a/src/lib/Bcfg2/Server/Plugin/base.py b/src/lib/Bcfg2/Server/Plugin/base.py
index 03feceb6f..b2d9fa7c8 100644
--- a/src/lib/Bcfg2/Server/Plugin/base.py
+++ b/src/lib/Bcfg2/Server/Plugin/base.py
@@ -1,66 +1,10 @@
 """This module provides the base class for Bcfg2 server plugins."""
 
 import os
-import logging
+from Bcfg2.Logger import Debuggable
 from Bcfg2.Utils import ClassName
 
 
-class Debuggable(object):
-    """ Mixin to add a debugging interface to an object and expose it
-    via XML-RPC on :class:`Bcfg2.Server.Plugin.base.Plugin` objects """
-
-    #: List of names of methods to be exposed as XML-RPC functions
-    __rmi__ = ['toggle_debug', 'set_debug']
-
-    #: How exposed XML-RPC functions should be dispatched to child
-    #: processes.
-    __child_rmi__ = __rmi__[:]
-
-    def __init__(self, name=None):
-        """
-        :param name: The name of the logger object to get.  If none is
-                     supplied, the full name of the class (including
-                     module) will be used.
-        :type name: string
-
-        .. autoattribute:: __rmi__
-        """
-        if name is None:
-            name = "%s.%s" % (self.__class__.__module__,
-                              self.__class__.__name__)
-        self.debug_flag = False
-        self.logger = logging.getLogger(name)
-
-    def set_debug(self, debug):
-        """ Explicitly enable or disable debugging.  This method is exposed
-        via XML-RPC.
-
-        :returns: bool - The new value of the debug flag
-        """
-        self.debug_flag = debug
-        return debug
-
-    def toggle_debug(self):
-        """ Turn debugging output on or off.  This method is exposed
-        via XML-RPC.
-
-        :returns: bool - The new value of the debug flag
-        """
-        return self.set_debug(not self.debug_flag)
-
-    def debug_log(self, message, flag=None):
-        """ Log a message at the debug level.
-
-        :param message: The message to log
-        :type message: string
-        :param flag: Override the current debug flag with this value
-        :type flag: bool
-        :returns: None
-        """
-        if (flag is None and self.debug_flag) or flag:
-            self.logger.error(message)
-
-
 class Plugin(Debuggable):
     """ The base class for all Bcfg2 Server plugins. """