commit b29e6b51aa37643aa06ced7e70164d101de87f32 Author: Arturo Filastò <arturo@filasto.net> Date: Tue Nov 29 19:10:55 2016 +0000 Wait for tor to start on decks that use a tor based collector (#684) --- ooni/deck/deck.py | 4 ++++ ooni/ui/web/server.py | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ooni/deck/deck.py b/ooni/deck/deck.py index 59946ab..50887b5 100644 --- a/ooni/deck/deck.py +++ b/ooni/deck/deck.py @@ -150,6 +150,10 @@ class NGDeck(object): if self.metadata.get('no_collector', False): self.no_collector = True + if (self.no_collector is False and + self.bouncer.backend_type == "onion"): + self.requires_tor = True + @property def tasks(self): return self._tasks diff --git a/ooni/ui/web/server.py b/ooni/ui/web/server.py index bb4e45f..40c03e2 100644 --- a/ooni/ui/web/server.py +++ b/ooni/ui/web/server.py @@ -529,7 +529,6 @@ class WebUIAPI(object): @requires_true(attrs=['_is_initialized']) @defer.inlineCallbacks def api_measurement_summary(self, request, measurement_id): - log.warn("SUMMARY") try: measurement = get_measurement(measurement_id) except InsecurePath: