[tor-commits] [arm/master] Dropping 'startup.blindModeEnabled' conifg option

[atagar at torproject.org]

commit 5e34550352ee19df1bc21a09232842d067c82e28
Author: Damian Johnson <atagar at torproject.org>
Date:   Fri Oct 18 11:03:45 2013 -0700

    Dropping 'startup.blindModeEnabled' conifg option
    
    The blind mode config option was mostly synonymous for the option to drop the
    connection panel from the interface. Dropping the duplication so '--blind'
    simply sets that instead.
---
 arm/controller.py |    8 ++++----
 arm/starter.py    |    5 +++--
 armrc.sample      |    1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arm/controller.py b/arm/controller.py
index 29d1fea..680fcf8 100644
--- a/arm/controller.py
+++ b/arm/controller.py
@@ -38,7 +38,6 @@ def conf_handler(key, value):
 CONFIG = conf.config_dict("arm", {
   "startup.events": "N3",
   "startup.dataDirectory": "~/.arm",
-  "startup.blindModeEnabled": False,
   "features.panels.show.graph": True,
   "features.panels.show.log": True,
   "features.panels.show.connection": True,
@@ -89,7 +88,7 @@ def initController(stdscr, startTime):
   if firstPagePanels: pagePanels.append(firstPagePanels)
 
   # second page: connections
-  if not CONFIG["startup.blindModeEnabled"] and CONFIG["features.panels.show.connection"]:
+  if CONFIG["features.panels.show.connection"]:
     pagePanels.append([arm.connections.connPanel.ConnectionPanel(stdscr)])
 
   # third page: config
@@ -111,7 +110,8 @@ def initController(stdscr, startTime):
     bwStats = arm.graphing.bandwidthStats.BandwidthStats()
     graphPanel.addStats(GraphStat.BANDWIDTH, bwStats)
     graphPanel.addStats(GraphStat.SYSTEM_RESOURCES, arm.graphing.resourceStats.ResourceStats())
-    if not CONFIG["startup.blindModeEnabled"]:
+
+    if CONFIG["features.panels.show.connection"]:
       graphPanel.addStats(GraphStat.CONNECTIONS, arm.graphing.connStats.ConnStats())
 
     # sets graph based on config parameter
@@ -519,7 +519,7 @@ def start_arm(start_time):
   :param float start_time: unix timestamp for when arm was started
   """
 
-  if not CONFIG["startup.blindModeEnabled"]:
+  if CONFIG["features.panels.show.connection"]:
     # The DisableDebuggerAttachment will prevent our connection panel from really
     # functioning. It'll have circuits, but little else. If this is the case then
     # notify the user and tell them what they can do to fix it.
diff --git a/arm/starter.py b/arm/starter.py
index 95dbc46..501c582 100644
--- a/arm/starter.py
+++ b/arm/starter.py
@@ -33,7 +33,6 @@ LOG_DUMP_PATH = os.path.expanduser("~/.arm/log")
 
 CONFIG = stem.util.conf.config_dict("arm", {
   'tor.password': None,
-  'startup.blindModeEnabled': False,
   'startup.events': 'N3',
   'msg.help': '',
   'msg.debug_header': '',
@@ -319,7 +318,9 @@ def main():
   else:
     stem.util.log.notice(CONFIG['msg.config_not_found'].format(path = args.config))
 
-  config.set("startup.blindModeEnabled", str(args.blind))
+  if args.blind:
+    config.set('features.panels.show.connection', 'false')
+
   config.set("startup.events", args.logged_events)
 
   # validates and expands log event flags
diff --git a/armrc.sample b/armrc.sample
index a43105f..37e4bd4 100644
--- a/armrc.sample
+++ b/armrc.sample
@@ -1,6 +1,5 @@
 # Startup options
 tor.password
-startup.blindModeEnabled false
 startup.events N3
 startup.dataDirectory ~/.arm