diff options
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 \ |