- dev

Author: zzzeek

sqlalchemy_collectd/server/aggregator.py

@@ -11,14 +11,11 @@ def __init__(self, bucket_names, interval=10):
         self.buckets = {name: TimeBucket(4, interval) for name in bucket_names}
 
     def set_stats(
-            self, bucket_name, hostname, progname, pid, timestamp, numpools,
-            checkedout, checkedin, detached, invalidated, total):
+            self, bucket_name, hostname, progname, pid, timestamp, values):
 
         bucket = self.buckets[bucket_name]
         records = bucket.get_data(timestamp)
-        records[(hostname, progname, pid)] = (
-            numpools, checkedout, checkedin, detached, invalidated, total
-        )
+        records[(hostname, progname, pid)] = values
 
     def get_stats_by_progname(self, bucket_name, timestamp, agg_func):
         bucket = self.buckets[bucket_name]

sqlalchemy_collectd/server/receiver.py

@@ -35,7 +35,7 @@ def receive(self, connection):
         values = message[protocol.TYPE_VALUES]
         pid = message[protocol.TYPE_TYPE_INSTANCE]
         self.aggregator.set_stats(
-            type_name, host, progname, pid, timestamp, *values
+            type_name, host, progname, pid, timestamp, values
         )
 
     def summarize(self, timestamp):