@@ -15,7 +15,8 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
1515(C) 2013- by Adam Tauber, <asciimoo@gmail.com>
1616'''
1717
18−import grequests
18+import requests as requests_lib
19+import threading
1920import re
2021from itertools import izip_longest, chain
2122from datetime import datetime
@@ -32,6 +33,18 @@ from searx.query import Query
3233number_of_searches = 0
3334
3435
36+def threaded_requests(requests):
37+ for fn, url, request_args in requests:
38+ th = threading.Thread(
39+ target=fn, args=(url,), kwargs=request_args, name=url,
40+ )
41+ th.start()
42+
43+ for th in threading.enumerate():
44+ if th.name.startswith('http'):
45+ th.join()
46+
47+
3548# get default reqest parameter
3649def default_request_params():
3750 return {
@@ -471,9 +484,9 @@ class Search(object):
471484
472485 # specific type of request (GET or POST)
473486 if request_params['method'] == 'GET':
474− req = grequests.get
487+ req = requests_lib.get
475488 else:
476− req = grequests.post
489+ req = requests_lib.post
477490 request_args['data'] = request_params['data']
478491
479492 # ignoring empty urls
@@ -481,10 +494,10 @@ class Search(object):
481494 continue
482495
483496 # append request to list
484− requests.append(req(request_params['url'], **request_args))
497+ requests.append((req, request_params['url'], request_args))
485498
486499 # send all search-request
487− grequests.map(requests)
500+ threaded_requests(requests)
488501
489502 # update engine-specific stats
490503 for engine_name, engine_results in results.items():