[tor-commits] [arm/master] Renaming query related config options

[atagar at torproject.org]

commit edfba0e97ffbe7f92633959b86f49f86e93bd35e
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon Oct 28 12:30:41 2013 -0700

    Renaming query related config options
    
    Minor change to the naming convention for our query rates. Also dropping
    'queries.useProc' from the sample armrc since it no longer exists (stem is
    smart enough to know when proc is available or not).
---
 arm/util/tracker.py |    8 ++++----
 armrc.sample        |   11 ++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/arm/util/tracker.py b/arm/util/tracker.py
index f5ac768..7f8ae02 100644
--- a/arm/util/tracker.py
+++ b/arm/util/tracker.py
@@ -33,8 +33,8 @@ from stem.control import State
 from stem.util import conf, connection, log, proc, str_tools, system
 
 CONFIG = conf.config_dict('arm', {
-  'queries.resourceUsage.rate': 5,
-  'queries.connections.minRate': 5,
+  'queries.resources.rate': 5,
+  'queries.connections.rate': 5,
   'msg.unable_to_use_resolver': '',
   'msg.unable_to_use_all_resolvers': '',
 })
@@ -208,7 +208,7 @@ class ConnectionTracker(Daemon):
   """
 
   def __init__(self):
-    Daemon.__init__(self, CONFIG["queries.connections.minRate"])
+    Daemon.__init__(self, CONFIG['queries.connections.rate'])
 
     self._resolvers = connection.get_system_resolvers()
     self._connections = []
@@ -323,7 +323,7 @@ class ResourceTracker(Daemon):
   """
 
   def __init__(self):
-    Daemon.__init__(self, CONFIG["queries.resourceUsage.rate"])
+    Daemon.__init__(self, CONFIG['queries.resources.rate'])
 
     self._last_sample = None
 
diff --git a/armrc.sample b/armrc.sample
index 682db5e..a4f7a71 100644
--- a/armrc.sample
+++ b/armrc.sample
@@ -4,8 +4,10 @@ startup.events N3
 startup.dataDirectory ~/.arm
 
 # Seconds between querying information
-queries.resourceUsage.rate 5
-queries.connections.minRate 5
+
+queries.resources.rate 5
+queries.connections.rate 5
+
 queries.refreshRate.rate 5
 
 # allows individual panels to be included/excluded
@@ -15,11 +17,6 @@ features.panels.show.connection true
 features.panels.show.config true
 features.panels.show.torrc true
 
-# Read the proc contents directly instead of calling ps, netstat, and other
-# resolvers. This provides very sizable performance benefits (around 90%
-# faster lookups) but this is only available on Linux.
-queries.useProc true
-
 # Renders the interface with color if set and the terminal supports it
 features.colorInterface true