commit 221372e3ebdc1d29c55620e6045e90d05423b71b Merge: a56c2ff 08d1c15 Author: aagbsn <aagbsn@extc.org> Date: Mon Nov 4 14:02:58 2013 -0800 Merge pull request #208 from TheTorProject/feature/use_txsocksx Feature/use txsocksx .../manipulation/http_header_field_manipulation.py | 2 +- ooni/oonibclient.py | 17 +- ooni/reporter.py | 21 +- ooni/templates/httpt.py | 20 +- ooni/tests/test_trueheaders.py | 2 +- ooni/utils/trueheaders.py | 159 +++++++++++++++ ooni/utils/txagentwithsocks.py | 215 -------------------- 7 files changed, 199 insertions(+), 237 deletions(-) diff --cc ooni/oonibclient.py index 4853047,889dcd9..5735155 --- a/ooni/oonibclient.py +++ b/ooni/oonibclient.py @@@ -69,8 -75,9 +75,9 @@@ class OONIBClient(object) # we have reached the retry count. if attempts < self.retries: log.err("Lookup failed. Retrying.") + log.exception(err) attempts += 1 - perform_request() + perform_request(attempts) else: log.err("Failed. Giving up.") finished.errback(err) diff --cc ooni/reporter.py index 72c6975,f4521b6..d90c259 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@@ -17,9 -17,11 +17,11 @@@ from twisted.trial import reporte from twisted.internet import defer, reactor from twisted.internet.error import ConnectionRefusedError from twisted.python.failure import Failure + from twisted.internet.endpoints import TCP4ClientEndpoint + from twisted.web.client import Agent from ooni.utils import log - +from ooni.tasks import Measurement try: from scapy.packet import Packet except ImportError: