From e3759d2a2e5fdb0e0a7f7dfa4f8244fdbb3ffe92 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Wed, 25 Jan 2006 16:48:06 +0000 Subject: Introduce the new logging infrastructure and convert the server (and bcfg2-info) over to using it git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1717 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/Account.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib/Server/Plugins/Account.py') diff --git a/src/lib/Server/Plugins/Account.py b/src/lib/Server/Plugins/Account.py index 05174486d..076afa032 100644 --- a/src/lib/Server/Plugins/Account.py +++ b/src/lib/Server/Plugins/Account.py @@ -1,9 +1,9 @@ '''This handles authentication setup''' __revision__ = '$Revision$' -from Bcfg2.Server.Plugin import Plugin, PluginInitError, DirectoryBacked +import Bcfg2.Server.Plugin -class Account(Plugin): +class Account(Bcfg2.Server.Plugin.Plugin): '''This module generates account config files, based on an internal data repo: static.(passwd|group|limits.conf) -> static entries @@ -17,16 +17,16 @@ class Account(Plugin): __author__ = 'bcfg-dev@mcs.anl.gov' def __init__(self, core, datastore): - Plugin.__init__(self, core, datastore) + Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) self.Entries = {'ConfigFile':{'/etc/passwd':self.from_yp_cb, '/etc/group':self.from_yp_cb, '/etc/security/limits.conf':self.gen_limits_cb, '/root/.ssh/authorized_keys':self.gen_root_keys_cb}} try: - self.repository = DirectoryBacked(self.data, self.core.fam) + self.repository = Bcfg2.Server.Plugin.DirectoryBacked(self.data, self.core.fam) except: - self.LogError("Failed to load repos: %s, %s" % (self.data, "%s/ssh" % (self.data))) - raise PluginInitError + self.logger.error("Failed to load repos: %s, %s" % (self.data, "%s/ssh" % (self.data))) + raise Bcfg2.Server.Plugin.PluginInitError def from_yp_cb(self, entry, metadata): '''Build password file from cached yp data''' -- cgit v1.2.3-1-g7c22