summaryrefslogtreecommitdiff
path: root/searx/engines/__init__.py
diff options
context:
space:
mode:
authorasciimoo <asciimoo@gmail.com>2013-11-03 00:31:03 +0100
committerasciimoo <asciimoo@gmail.com>2013-11-03 00:31:03 +0100
commita8797839a10b779bb5b57c27c8e50a48fc9d9a3b (patch)
treeee336848ab7015788224466f043db1676e84cb6b /searx/engines/__init__.py
parentc3c9d147cebba75a6f7116cdaa85a0e3f432a264 (diff)
[enh] request timeout added
Diffstat (limited to 'searx/engines/__init__.py')
-rw-r--r--searx/engines/__init__.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py
index 29ec5af16..4fc39266e 100644
--- a/searx/engines/__init__.py
+++ b/searx/engines/__init__.py
@@ -120,16 +120,18 @@ def search(query, request, selected_categories):
callback = make_callback(selected_engine['name'], results, engine.response, request_params)
if request_params['method'] == 'GET':
req = grequests.get(request_params['url']
- ,headers=request_params['headers']
- ,hooks=dict(response=callback)
+ ,headers = request_params['headers']
+ ,hooks = dict(response=callback)
,cookies = request_params['cookies']
+ ,timeout = settings.timeout
)
else:
req = grequests.post(request_params['url']
- ,data=request_params['data']
- ,headers=request_params['headers']
- ,hooks=dict(response=callback)
+ ,data = request_params['data']
+ ,headers = request_params['headers']
+ ,hooks = dict(response=callback)
,cookies = request_params['cookies']
+ ,timeout = settings.timeout
)
requests.append(req)
grequests.map(requests)