[or-cvs] r22558: {arm} change: upping default refresh rate of graph so stat updates (in arm/trunk: . init interface/graphing)

[Damian Johnson]

Author: atagar
Date: 2010-06-26 22:27:20 +0000 (Sat, 26 Jun 2010)
New Revision: 22558

Modified:
   arm/trunk/armrc.sample
   arm/trunk/init/starter.py
   arm/trunk/interface/graphing/graphPanel.py
Log:
change: upping default refresh rate of graph so stat updates are presented



Modified: arm/trunk/armrc.sample
===================================================================
--- arm/trunk/armrc.sample	2010-06-26 22:10:52 UTC (rev 22557)
+++ arm/trunk/armrc.sample	2010-06-26 22:27:20 UTC (rev 22558)
@@ -12,11 +12,13 @@
 #           3 -> minutely,     4 -> half hour,  5 -> hourly,      6 -> daily
 # bound:    0 -> global maxima,        1 -> local maxima, 2 -> tight
 # type:     0 -> None, 1 -> Bandwidth, 2 -> Connections,  3 -> System Resources
+# frequentRefrsh: updates stats each second if true, otherwise matches interval
 
 features.graph.interval 0
 features.graph.bound 1
 features.graph.type 1
 features.graph.maxSize 150
+features.graph.frequentRefresh true
 
 # ps graph parameters
 # primary/secondaryStat: any numeric field provided by the ps command

Modified: arm/trunk/init/starter.py
===================================================================
--- arm/trunk/init/starter.py	2010-06-26 22:10:52 UTC (rev 22557)
+++ arm/trunk/init/starter.py	2010-06-26 22:27:20 UTC (rev 22558)
@@ -136,7 +136,7 @@
       msg = "Failed to load configuration (using defaults): \"%s\"" % str(exc)
       util.log.log(util.log.WARN, msg)
   else:
-    msg = "No configuration found, using defaults: %s" % configPath
+    msg = "No configuration found at '%s', using defaults" % configPath
     util.log.log(util.log.NOTICE, msg)
   
   # overwrites undefined parameters with defaults

Modified: arm/trunk/interface/graphing/graphPanel.py
===================================================================
--- arm/trunk/interface/graphing/graphPanel.py	2010-06-26 22:10:52 UTC (rev 22557)
+++ arm/trunk/interface/graphing/graphPanel.py	2010-06-26 22:27:20 UTC (rev 22558)
@@ -39,7 +39,7 @@
 WIDE_LABELING_GRAPH_COL = 50  # minimum graph columns to use wide spacing for x-axis labels
 
 # used for setting defaults when initializing GraphStats and GraphPanel instances
-CONFIG = {"features.graph.interval": 0, "features.graph.bound": 1, "features.graph.maxSize": 150}
+CONFIG = {"features.graph.interval": 0, "features.graph.bound": 1, "features.graph.maxSize": 150, "features.graph.frequentRefresh": True}
 
 def loadConfig(config):
   config.update(CONFIG)
@@ -104,8 +104,10 @@
     """
     
     if self._graphPanel and not self.isPauseBuffer and not self.isPaused:
-      updateRate = UPDATE_INTERVALS[self._graphPanel.updateInterval][1]
-      if (self.tick + 1) % updateRate == 0: return True
+      if CONFIG["features.graph.frequentRefresh"]: return True
+      else:
+        updateRate = UPDATE_INTERVALS[self._graphPanel.updateInterval][1]
+        if (self.tick + 1) % updateRate == 0: return True
     
     return False