summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Statistics.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-15 08:21:45 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-15 08:21:45 -0400
commitb455dafd90b9710020f798cd73d63cd049685695 (patch)
tree0456007832aa19bc5d8bea84cbb647492926c7e2 /src/lib/Bcfg2/Server/Plugins/Statistics.py
parent06a2efea2f666b94eaf7e74bda798ed261fc47de (diff)
parente911b57eb38dfa0fc06d19e70e02e121ae721e57 (diff)
downloadbcfg2-b455dafd90b9710020f798cd73d63cd049685695.tar.gz
bcfg2-b455dafd90b9710020f798cd73d63cd049685695.tar.bz2
bcfg2-b455dafd90b9710020f798cd73d63cd049685695.zip
Merge branch 'tests'
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Statistics.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Statistics.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Statistics.py b/src/lib/Bcfg2/Server/Plugins/Statistics.py
index 9af7549ff..ce8d085cc 100644
--- a/src/lib/Bcfg2/Server/Plugins/Statistics.py
+++ b/src/lib/Bcfg2/Server/Plugins/Statistics.py
@@ -113,13 +113,11 @@ class StatisticsStore(object):
return (now-utime) > secondsPerDay
-class Statistics(Bcfg2.Server.Plugin.Plugin,
- Bcfg2.Server.Plugin.ThreadedStatistics,
+class Statistics(Bcfg2.Server.Plugin.ThreadedStatistics,
Bcfg2.Server.Plugin.PullSource):
name = 'Statistics'
def __init__(self, core, datastore):
- Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
Bcfg2.Server.Plugin.ThreadedStatistics.__init__(self, core, datastore)
Bcfg2.Server.Plugin.PullSource.__init__(self)
fpath = "%s/etc/statistics.xml" % datastore