commit bcd06c044bfbfb1d0191670088549c9f23e1a9d8 Author: Arturo Filastò art@fuffa.org Date: Fri Dec 27 12:16:57 2013 +0100

Clean up the output of ooni-probe --- ooni/director.py | 2 +- ooni/managers.py | 1 - ooni/reporter.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ooni/director.py b/ooni/director.py index 05344af..4c53ca6 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -175,7 +175,7 @@ class Director(object): self.totalMeasurements += 1

def measurementSucceeded(self, result, measurement): - log.msg("Successfully completed measurement: %s" % measurement) + log.debug("Successfully completed measurement: %s" % measurement) self.totalMeasurementRuntime += measurement.runtime self.successfulMeasurements += 1 measurement.result = result diff --git a/ooni/managers.py b/ooni/managers.py index b6e87e4..348343f 100644 --- a/ooni/managers.py +++ b/ooni/managers.py @@ -30,7 +30,6 @@ class TaskManager(object): to be re-run once all the currently scheduled tasks have run. """ log.err("Task %s has failed %s times" % (task, task.failures)) - log.exception(failure)

self._active_tasks.remove(task) self.failures = self.failures + 1 diff --git a/ooni/reporter.py b/ooni/reporter.py index d90c259..545997d 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -364,7 +364,7 @@ class OONIBReporter(OReporter): try: parsed_response = json.loads(backend_response) except Exception, e: - log.err("Failed to parse collector response") + log.err("Failed to parse collector response %s" % backend_response) log.exception(e) raise errors.OONIBReportCreationError