diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2009-01-12 01:07:34 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2009-01-12 01:07:34 +0000 |
commit | 80e4765f7cb7f1ebfa963af653b8e01da3333bd0 (patch) | |
tree | 82e946b7e4a08ae2739acafc5a8708549957c83a /src/lib/Server/Plugins | |
parent | 1affc07c26fad2528a5847a77db33a9baabb9fc8 (diff) | |
download | bcfg2-80e4765f7cb7f1ebfa963af653b8e01da3333bd0.tar.gz bcfg2-80e4765f7cb7f1ebfa963af653b8e01da3333bd0.tar.bz2 bcfg2-80e4765f7cb7f1ebfa963af653b8e01da3333bd0.zip |
Finish up Pull Source and multi-Statistics code
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5012 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins')
-rw-r--r-- | src/lib/Server/Plugins/DBStats.py | 2 | ||||
-rw-r--r-- | src/lib/Server/Plugins/Statistics.py | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/Server/Plugins/DBStats.py b/src/lib/Server/Plugins/DBStats.py index 24a030b64..c9d11a1f4 100644 --- a/src/lib/Server/Plugins/DBStats.py +++ b/src/lib/Server/Plugins/DBStats.py @@ -27,7 +27,7 @@ class DBStats(Bcfg2.Server.Plugin.Plugin, logger.debug(str(inst)) logger.debug(str(type(inst))) - def StoreStatistics(self, mdata, xdata): + def process_statistics(self, mdata, xdata): newstats = xdata.find("Statistics") newstats.set('time', time.asctime(time.localtime())) e = lxml.etree.Element('Node', name=mdata.hostname) diff --git a/src/lib/Server/Plugins/Statistics.py b/src/lib/Server/Plugins/Statistics.py index ca7a3c5b0..cd53d173a 100644 --- a/src/lib/Server/Plugins/Statistics.py +++ b/src/lib/Server/Plugins/Statistics.py @@ -22,6 +22,7 @@ class StatisticsStore(object): def WriteBack(self, force=0): '''Write statistics changes back to persistent store''' + # FIXME switch to a thread writer if (self.dirty and (self.lastwrite + self.__min_write_delay__ <= time()) ) \ or force: try: @@ -119,12 +120,9 @@ class Statistics(Bcfg2.Server.Plugin.Plugin, fpath = "%s/etc/statistics.xml" % datastore self.data_file = StatisticsStore(fpath) - def StoreStatistics(self, client, xdata): + def process_statistics(self, client, xdata): self.data_file.updateStats(xdata, client.hostname) - def WriteBack(self): - self.data_file.WriteBack() - def FindCurrent(self, client): rt = self.data_file.element.xpath('//Node[@name="%s"]' % client)[0] maxtime = max([strptime(stat.get('time')) for stat \ |