[rhmessaging-commits] rhmessaging commits: r4225 - in mgmt/newdata: cumin/etc and 2 other directories.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2010-08-25 18:16:37 -0400 (Wed, 25 Aug 2010)
New Revision: 4225

Modified:
   mgmt/newdata/cumin/bin/cumin-web
   mgmt/newdata/cumin/etc/cumin.conf
   mgmt/newdata/cumin/python/cumin/config.py
   mgmt/newdata/cumin/python/cumin/main.py
   mgmt/newdata/wooly/python/wooly/pages.py
Log:
Fixed BZ 627350: Page update interval set to 10 seconds.
- added new [web] config value in cumin.conf of update_interval (in seconds)

Modified: mgmt/newdata/cumin/bin/cumin-web
===================================================================
--- mgmt/newdata/cumin/bin/cumin-web	2010-08-25 20:22:56 UTC (rev 4224)
+++ mgmt/newdata/cumin/bin/cumin-web	2010-08-25 22:16:37 UTC (rev 4225)
@@ -30,6 +30,7 @@
 
     cumin.debug = opts.debug
     cumin.user = values.web.user
+    cumin.update_interval = values.web.update_interval
 
     cumin.check()
     cumin.init()

Modified: mgmt/newdata/cumin/etc/cumin.conf
===================================================================
--- mgmt/newdata/cumin/etc/cumin.conf	2010-08-25 20:22:56 UTC (rev 4224)
+++ mgmt/newdata/cumin/etc/cumin.conf	2010-08-25 22:16:37 UTC (rev 4225)
@@ -10,6 +10,7 @@
 # host: localhost
 # port: 45672
 # operator-email: [none]
+# update-interval: 10
 
 [data]
 # log-file: $CUMIN_HOME/log/data.log

Modified: mgmt/newdata/cumin/python/cumin/config.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/config.py	2010-08-25 20:22:56 UTC (rev 4224)
+++ mgmt/newdata/cumin/python/cumin/config.py	2010-08-25 22:16:37 UTC (rev 4225)
@@ -20,6 +20,9 @@
         web = CuminConfigSection(self, "web")
         web.log_file.default = os.path.join(self.home, "log", "web.log")
 
+        param = ConfigParameter(web, "update_interval", int)
+        param.default = 10
+
         param = ConfigParameter(web, "host", str)
         param.default = "localhost"
 

Modified: mgmt/newdata/cumin/python/cumin/main.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/main.py	2010-08-25 20:22:56 UTC (rev 4224)
+++ mgmt/newdata/cumin/python/cumin/main.py	2010-08-25 22:16:37 UTC (rev 4225)
@@ -52,6 +52,7 @@
 
         self.user = None
         self.operator_email = None
+        self.update_interval = 10
 
     def check(self):
         log.info("Checking %s", self)

Modified: mgmt/newdata/wooly/python/wooly/pages.py
===================================================================
--- mgmt/newdata/wooly/python/wooly/pages.py	2010-08-25 20:22:56 UTC (rev 4224)
+++ mgmt/newdata/wooly/python/wooly/pages.py	2010-08-25 22:16:37 UTC (rev 4225)
@@ -154,7 +154,10 @@
         super(AjaxScript, self).__init__(app, name)
 
         self.html_page = html_page
-        self.interval = 3000
+        try:
+            self.interval = app.update_interval * 1000
+        except AttributeError:
+            self.interval = 10000
 
     def do_render(self, session):
         if self.get_widget_list(session):