[tor-commits] [oonib/master] Fix 500 error with bouncer

[art at torproject.org]

commit f32e07783d3d4490433ba7ee3672c35c62b62749
Author: Arturo Filastò <art at fuffa.org>
Date:   Fri Jan 23 16:08:41 2015 +0100

    Fix 500 error with bouncer
---
 oonib/bouncer/handlers.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/oonib/bouncer/handlers.py b/oonib/bouncer/handlers.py
index 7de2aca..1c7627c 100644
--- a/oonib/bouncer/handlers.py
+++ b/oonib/bouncer/handlers.py
@@ -160,7 +160,14 @@ class Bouncer(object):
                 requested_nettest['test-helpers'])
             test_helpers = {}
             for test_helper in requested_nettest['test-helpers']:
-                test_helpers[test_helper] = self.bouncerFile['collector'][collector]['test-helper'][test_helper]
+                try:
+                    test_helpers[test_helper] = self.bouncerFile['collector'][collector]['test-helper'][test_helper]
+                except KeyError:
+                    helpers = self.knownHelpers.get(test_helper)
+                    if not helpers:
+                        raise e.CollectorNotFound
+                    helper = random.choice(helpers)
+                    test_helpers[test_helper] = helper['helper-address']
 
             nettest = {
                 'name': requested_nettest['name'],
@@ -178,7 +185,7 @@ class BouncerHandlerBase(OONIBHandler):
         self.bouncer = Bouncer(config.main.bouncer_file)
 
     def load_query(self):
-        if not 'query' in dir(self):
+        if 'query' not in dir(self):
             try:
                 self.query = json.loads(self.request.body)
             except ValueError: