[rhmessaging-commits] rhmessaging commits: r4234 - in mgmt/newdata: cumin/python/cumin and 1 other directories.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2010-08-26 17:34:22 -0400 (Thu, 26 Aug 2010)
New Revision: 4234

Modified:
   mgmt/newdata/cumin/etc/cumin.conf
   mgmt/newdata/cumin/python/cumin/config.py
   mgmt/newdata/mint/python/mint/expire.py
   mgmt/newdata/mint/python/mint/main.py
Log:
Rename expire frequency to interval; it's a better name and it matches the new parameter that Ernie introduced for the web update interval

Modified: mgmt/newdata/cumin/etc/cumin.conf
===================================================================
--- mgmt/newdata/cumin/etc/cumin.conf	2010-08-26 21:10:31 UTC (rev 4233)
+++ mgmt/newdata/cumin/etc/cumin.conf	2010-08-26 21:34:22 UTC (rev 4234)
@@ -14,5 +14,5 @@
 
 [data]
 # log-file: $CUMIN_HOME/log/data.log
-# expire-frequency: 600
+# expire-interval: 600
 # expire-threshold: 86400

Modified: mgmt/newdata/cumin/python/cumin/config.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/config.py	2010-08-26 21:10:31 UTC (rev 4233)
+++ mgmt/newdata/cumin/python/cumin/config.py	2010-08-26 21:34:22 UTC (rev 4234)
@@ -38,7 +38,7 @@
 
         param = ConfigParameter(data, "packages", str)
 
-        param = ConfigParameter(data, "expire-frequency", int)
+        param = ConfigParameter(data, "expire-interval", int)
         param.default = 600 # 10 minutes
 
         param = ConfigParameter(data, "expire-threshold", int)

Modified: mgmt/newdata/mint/python/mint/expire.py
===================================================================
--- mgmt/newdata/mint/python/mint/expire.py	2010-08-26 21:10:31 UTC (rev 4233)
+++ mgmt/newdata/mint/python/mint/expire.py	2010-08-26 21:34:22 UTC (rev 4234)
@@ -9,19 +9,19 @@
     def init(self):
         log.debug("Initializing %s", self)
 
-        frequency = self.app.expire_frequency
+        interval = self.app.expire_interval
         threshold = self.app.expire_threshold
 
-        frequency_out, frequency_unit = convert_time_units(frequency)
+        interval_out, interval_unit = convert_time_units(interval)
         threshold_out, threshold_unit = convert_time_units(threshold)
 
-        args = (threshold_out, threshold_unit, frequency_out, frequency_unit)
+        args = (threshold_out, threshold_unit, interval_out, interval_unit)
 
         log.debug("Expiring database records older than %d %s, every %d %s" \
                     % args)
 
     def run(self):
-        frequency = self.app.expire_frequency
+        interval = self.app.expire_interval
 
         while True:
             if self.stop_requested:
@@ -30,7 +30,7 @@
             up = ExpireUpdate(self.app.model)
             self.app.update_thread.enqueue(up)
 
-            sleep(frequency)
+            sleep(interval)
 
 class ExpireUpdate(Update):
     def do_process(self, cursor, stats):

Modified: mgmt/newdata/mint/python/mint/main.py
===================================================================
--- mgmt/newdata/mint/python/mint/main.py	2010-08-26 21:10:31 UTC (rev 4233)
+++ mgmt/newdata/mint/python/mint/main.py	2010-08-26 21:34:22 UTC (rev 4234)
@@ -21,7 +21,7 @@
         self.update_thread = UpdateThread(self)
 
         self.expire_enabled = True
-        self.expire_frequency = 600
+        self.expire_interval = 600
         self.expire_threshold = 24 * 3600
         self.expire_thread = ExpireThread(self)