From f400c03da3da541b291a7051b30c320764f6d200 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 22 Jul 2008 01:41:51 +0000 Subject: move xml statistics over to new typed-plugin system (enables direct-to-django statistics plugin) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4817 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Core.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/lib/Server/Core.py') diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index 2bbbbc4f4..d7086aa96 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -3,7 +3,6 @@ __revision__ = '$Revision$' from time import time from Bcfg2.Server.Plugin import PluginInitError, PluginExecutionError -from Bcfg2.Server.Statistics import Statistics import logging, lxml.etree, os, stat import Bcfg2.Server.Plugins.Metadata @@ -222,8 +221,6 @@ class Core(object): except: self.svn = False - self.stats = Statistics("%s/etc/statistics.xml" % (self.datastore)) - [data.remove('') for data in [structures, generators] if '' in data] @@ -242,6 +239,17 @@ class Core(object): self.metadata = self.plugins["Metadata"] break + plugins = self.plugins.values() + while True: + plugin = plugins.pop() + if isinstance(plugin, Bcfg2.Server.Plugin.StatisticsPlugin): + self.stats = plugin + break + if not plugins: + self.init_plugins("Statistics") + self.stats = self.plugins["Statistics"] + break + for plug_names, plug_tname, plug_type, collection in \ [(structures, 'structure', Bcfg2.Server.Plugin.StructurePlugin, self.structures), -- cgit v1.2.3-1-g7c22