[rhmessaging-commits] rhmessaging commits: r3873 - mgmt/newdata/mint/python/mint.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2010-03-22 13:45:10 -0400 (Mon, 22 Mar 2010)
New Revision: 3873

Modified:
   mgmt/newdata/mint/python/mint/model.py
   mgmt/newdata/mint/python/mint/newupdate.py
Log:
More stat -> sample name changes

Modified: mgmt/newdata/mint/python/mint/model.py
===================================================================
--- mgmt/newdata/mint/python/mint/model.py	2010-03-22 16:54:24 UTC (rev 3872)
+++ mgmt/newdata/mint/python/mint/model.py	2010-03-22 17:45:10 UTC (rev 3873)
@@ -255,7 +255,7 @@
             self.model.app.update_thread.enqueue(up)
 
         if self.model.app.new_update_thread.isAlive():
-            up = NewStatsUpdate(self.model, agent, object)
+            up = NewSampleUpdate(self.model, agent, object)
             self.model.app.new_update_thread.enqueue(up)
 
     def event(self, broker, event):

Modified: mgmt/newdata/mint/python/mint/newupdate.py
===================================================================
--- mgmt/newdata/mint/python/mint/newupdate.py	2010-03-22 16:54:24 UTC (rev 3872)
+++ mgmt/newdata/mint/python/mint/newupdate.py	2010-03-22 17:45:10 UTC (rev 3873)
@@ -59,9 +59,9 @@
         self.deleted = 0
         self.dropped = 0
 
-        self.stats_updated = 0
-        self.stats_expired = 0
-        self.stats_dropped = 0
+        self.samples_updated = 0
+        self.samples_expired = 0
+        self.samples_dropped = 0
 
 class NewUpdate(object):
     def __init__(self, model):
@@ -295,30 +295,30 @@
 
         stats.deleted += 1
 
-class NewStatsUpdate(NewObjectUpdate):
+class NewSampleUpdate(NewObjectUpdate):
     def do_process(self, conn, stats):
         cls = self.get_class()
         obj = self.get_object(cls, self.object_id)
 
         if not cls._statistics:
-            stats.stats_dropped += 1; return
+            stats.samples_dropped += 1; return
 
         if not obj._id:
-            stats.stats_dropped += 1; return
+            stats.samples_dropped += 1; return
 
         if stats.enqueued - stats.dequeued > 100:
             if obj._qmf_update_time > datetime.now() - timedelta(seconds=60):
-                stats.stats_dropped += 1; return
+                stats.samples_dropped += 1; return
 
         update_columns = list()
         update_columns.append(cls.sql_table._qmf_update_time)
 
         insert_columns = list()
-        insert_columns.append(cls.sql_table._qmf_update_time)
+        insert_columns.append(cls.sql_samples_table._qmf_update_time)
 
         obj._qmf_update_time = self.update_time
 
-        self.process_statistics(obj, update_columns, insert_columns)
+        self.process_samples(obj, update_columns, insert_columns)
 
         cursor = conn.cursor()
 
@@ -329,9 +329,9 @@
         finally:
             cursor.close()
 
-        stats.stats_updated += 1
+        stats.samples_updated += 1
             
-    def process_statistics(self, obj, update_columns, insert_columns):
+    def process_samples(self, obj, update_columns, insert_columns):
         for stat, value in self.object.getStatistics():
             try:
                 col = obj._class._statistics_by_name[stat.name].sql_column