From d7e21c89c1b2e37ff45b40d14680a74ffc4974a5 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 9 Nov 2009 20:01:28 +0000 Subject: Reports: Add server name to reports (Patch from Tim Laszlo) Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5562 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/DBStats.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/lib/Server/Plugins/DBStats.py b/src/lib/Server/Plugins/DBStats.py index 4a7e04db2..0ecf9abde 100644 --- a/src/lib/Server/Plugins/DBStats.py +++ b/src/lib/Server/Plugins/DBStats.py @@ -1,9 +1,13 @@ +import difflib +import logging +import lxml.etree +import platform +import time + import Bcfg2.Server.Plugin import Bcfg2.Server.Reports.importscript from Bcfg2.Server.Reports.reports.models import Client -import difflib, lxml.etree, time, logging import Bcfg2.Server.Reports.settings - from Bcfg2.Server.Reports.updatefix import update_database # for debugging output only logger = logging.getLogger('Bcfg2.Plugins.DBStats') @@ -39,12 +43,14 @@ class DBStats(Bcfg2.Server.Plugin.Plugin, container.append(e) # FIXME need to build a metadata interface to expose a list of clients - # FIXME Server processing the request should be mentionned here start = time.time() for i in [1, 2, 3]: try: - Bcfg2.Server.Reports.importscript.load_stats( - self.core.metadata.clientdata, container, 0, True) + Bcfg2.Server.Reports.importscript.load_stats(self.core.metadata.clientdata, + container, + 0, + True, + platform.node()) break except: logger.error("DBStats: Failed to write to db (lock); retrying", -- cgit v1.2.3-1-g7c22