X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=database.py;h=96664af7d08ac690096a84dade3f6e103c97afc2;hb=cdf732863cd300caf8222c59e3f38256d9e04fca;hp=020fd255da85ab9616d520d510be58b8a7596e6c;hpb=359fe09b9c56bb24fee2d828d2baddfaec7f9c05;p=nodemanager.git diff --git a/database.py b/database.py index 020fd25..96664af 100644 --- a/database.py +++ b/database.py @@ -17,7 +17,7 @@ import cPickle import threading import time -import accounts +import account import coresched import logger import tools @@ -127,16 +127,16 @@ It may be necessary in the future to do something smarter.""" # create and destroy accounts as needed logger.verbose("database: sync : fetching accounts") - existing_acct_names = accounts.all() + existing_acct_names = account.all() for name in existing_acct_names: if name not in self: logger.verbose("database: sync : ensure_destroy'ing %s"%name) - accounts.get(name).ensure_destroyed() + account.get(name).ensure_destroyed() for name, rec in self.iteritems(): # protect this; if anything fails for a given sliver # we still need the other ones to be handled try: - sliver = accounts.get(name) + sliver = account.get(name) logger.verbose("database: sync : looping on %s (shell account class from pwd %s)" %(name,sliver._get_class())) # Make sure we refresh accounts that are running if rec['instantiation'] == 'plc-instantiated':