diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2006-01-25 16:48:06 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2006-01-25 16:48:06 +0000 |
commit | e3759d2a2e5fdb0e0a7f7dfa4f8244fdbb3ffe92 (patch) | |
tree | 31d523f4849b2a3232f92c2142cdd35b96beb5e1 /src/lib/Server/Plugins/Account.py | |
parent | edca0b698637c3fd0a70af7e4752a46afca938d3 (diff) | |
download | bcfg2-e3759d2a2e5fdb0e0a7f7dfa4f8244fdbb3ffe92.tar.gz bcfg2-e3759d2a2e5fdb0e0a7f7dfa4f8244fdbb3ffe92.tar.bz2 bcfg2-e3759d2a2e5fdb0e0a7f7dfa4f8244fdbb3ffe92.zip |
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
Diffstat (limited to 'src/lib/Server/Plugins/Account.py')
-rw-r--r-- | src/lib/Server/Plugins/Account.py | 12 |
1 files changed, 6 insertions, 6 deletions
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''' |