commit dc48bc3ce9c43de591d60e95617e94c059bfeef0 Author: Arturo Filastò art@fuffa.org Date: Fri Dec 27 14:06:48 2013 +0100

Properly handle probe IP address lookup failures --- ooni/oonicli.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 9405044..061eab3 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -176,7 +176,7 @@ def runWithDirector(): r = failure.trap(errors.TorNotRunning, errors.InvalidOONIBCollectorAddress, errors.UnableToLoadDeckInput, errors.CouldNotFindTestHelper, - errors.CouldNotFindTestCollector) + errors.CouldNotFindTestCollector, errors.ProbeIPUnknown)

if isinstance(failure.value, errors.TorNotRunning): log.err("Tor does not appear to be running") @@ -201,6 +201,9 @@ def runWithDirector(): log.err("Could not find a valid collector.") log.msg("Try with a different bouncer, specify a collector with -c or disable reporting to a collector with -n.")

+ elif isinstance(failure.value, errors.ProbeIPUnknown): + log.err("Failed to lookup probe IP address.") + log.msg("Check your internet connection.")

if config.advanced.debug: log.exception(failure)