[tor-commits] [oonib/master] explain + bail out when inconsistent config

[art at torproject.org]

commit 3bcce2080b6e986c992c9cad9dc4b8e25bebaa10
Author: Joe Landers <joe at joelanders.net>
Date:   Fri May 13 09:32:17 2016 +0200

    explain + bail out when inconsistent config
---
 oonib/oonibackend.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py
index 9c9a0fa..3802566 100644
--- a/oonib/oonibackend.py
+++ b/oonib/oonibackend.py
@@ -103,6 +103,8 @@ if config.helpers['http-return-json-headers'].port:
     http_return_request_helper.startService()
 
 def getHSEndpoint(endpoint_config):
+    if torconfig is None:
+        raise Exception("you probably need to set tor_hidden_service: true")
     hsdir = os.path.join(torconfig.DataDirectory, endpoint_config['hsdir'])
     if LooseVersion(txtorcon_version) >= LooseVersion('0.10.0'):
         return TCPHiddenServiceEndpoint.global_tor(reactor,
@@ -149,6 +151,7 @@ def createService(endpoint, role, endpoint_config):
     multiService.addService(service)
     service.startService()
 
+torconfig = None
 if config.main.tor_hidden_service:
     torconfig = TorConfig()
     configTor(torconfig)