diff --git a/src/api/index.py b/src/api/index.py index c9f0a4f..7575afa 100644 --- a/src/api/index.py +++ b/src/api/index.py @@ -253,7 +253,7 @@ def InitCollector(): # @TODO : Validate the account & plan, insure preconditions are met/satisfied # m = {'apps':'monitor.DetailProcess','folders':'monitor.FileWatch'} - a = {'apps':'actor.Apps','mailer':'actor.Mailer','folders':'actor.Folder'} + a = {'apps':'actor.Apps','mailer':'actor.Mailer','folders':'actor.Folders'} lagents = [] lactors = [] for id in m : diff --git a/src/utils/agents/manager.py b/src/utils/agents/manager.py index 816bd1b..27cb01c 100644 --- a/src/utils/agents/manager.py +++ b/src/utils/agents/manager.py @@ -55,8 +55,9 @@ class Manager() : self.LIMIT = -1 #self.filter(meta) - self.filter('agents',meta,self.agents) - self.filter('actors',meta,self.actors) + meta = meta[0] + self.agents = self.filter('agents',meta,self.agents) + self.actors = self.filter('actors',meta,self.actors) self.setup(meta) def filter_collectors(self,meta) : @@ -78,7 +79,7 @@ class Manager() : def filter(self,id,meta,objects): values = meta[id].replace(' ','').split(',') - return [item for item in objects if object.getName() in values] + return [item for item in objects if item.getName() in values] def __filter(self,meta) : scope = [] lactors= [] @@ -138,8 +139,8 @@ class Manager() : if len(args.keys()) > 0 : self.apply_setup('apps',args) args = couchdb.view('config/folders',key=self.key) - if 'folder_threshold' not in meta : - args['threshold'] = meta['folder_threshold'] + if 'folder_size' not in meta : + args['threshold'] = meta['folder_size'] self.apply_setup('folders',args) def apply_setup(self,name,args) :