[tor-commits] [oonib/master] Ensure bouncer_endpoints and collector_endpoints are by default empty lists

[art at torproject.org]

commit 90ca955e970ef30c5963acce77c5f736372fc440
Author: Arturo Filastò <arturo at filasto.net>
Date:   Fri May 13 13:20:28 2016 +0200

    Ensure bouncer_endpoints and collector_endpoints are by default empty lists
---
 oonib/oonibackend.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py
index 5a994e8..337b797 100644
--- a/oonib/oonibackend.py
+++ b/oonib/oonibackend.py
@@ -163,6 +163,9 @@ if config.main.bouncer_endpoints is None and config.main.tor_hidden_service:
 if config.main.collector_endpoints is None and config.main.tor_hidden_service:
     config.main.collector_endpoints = [ {'type': 'onion', 'hsdir': 'collector'} ]
 
+config.main.bouncer_endpoints = config.main.get('bouncer_endpoints', [])
+config.main.collector_endpoints = config.main.get('collector_endpoints', [])
+
 for endpoint_config in config.main.bouncer_endpoints:
     print "Starting bouncer with config %s" % endpoint_config
     endpoint = getEndpoint(endpoint_config)
@@ -172,4 +175,3 @@ for endpoint_config in config.main.collector_endpoints:
     print "Starting collector with config %s" % endpoint_config
     endpoint = getEndpoint(endpoint_config)
     createService(endpoint, 'collector', endpoint_config)
-