@@ -37,7 +37,7 @@ number_of_searches = 0
37def threaded_requests(requests):
37def threaded_requests(requests):
38 timeout_limit = max(r[2]['timeout'] for r in requests)
38 timeout_limit = max(r[2]['timeout'] for r in requests)
39 search_start = time()
39 search_start = time()
40− for fn, url, request_args in requests:
40+ for fn, url, request_args, engine_name in requests:
41 request_args['timeout'] = timeout_limit
41 request_args['timeout'] = timeout_limit
42 th = threading.Thread(
42 th = threading.Thread(
43 target=fn,
43 target=fn,
@@ -45,6 +45,7 @@ def threaded_requests(requests):
45 kwargs=request_args,
45 kwargs=request_args,
46 name='search_request',
46 name='search_request',
48+ th._engine_name = engine_name
48 th.start()
49 th.start()
50 for th in threading.enumerate():
51 for th in threading.enumerate():
@@ -52,7 +53,7 @@ def threaded_requests(requests):
52 remaining_time = max(0.0, timeout_limit - (time() - search_start))
53 remaining_time = max(0.0, timeout_limit - (time() - search_start))
53 th.join(remaining_time)
54 th.join(remaining_time)
54 if th.isAlive():
55 if th.isAlive():
55− print('engine timeout')
56+ print('engine timeout: {0}'.format(th._engine_name))
@@ -481,7 +482,7 @@ class Search(object):
483 # append request to list
484 # append request to list
484− requests.append((req, request_params['url'], request_args))
485+ requests.append((req, request_params['url'], request_args, selected_engine['name']))
486 # send all search-request
487 # send all search-request
487 threaded_requests(requests)
488 threaded_requests(requests)