[enh] request timeout added

Browse Source
This commit is contained in:
asciimoo 2013-11-03 00:31:03 +01:00
parent c3c9d147ce
commit a8797839a1
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
searx/engines/__init__.py
View File

@ -120,16 +120,18 @@ def search(query, request, selected_categories):
callback = make_callback(selected_engine['name'], results, engine.response, request_params) callback = make_callback(selected_engine['name'], results, engine.response, request_params)
if request_params['method'] == 'GET': if request_params['method'] == 'GET':
req = grequests.get(request_params['url'] req = grequests.get(request_params['url']
,headers=request_params['headers'] ,headers = request_params['headers']
,hooks=dict(response=callback) ,hooks = dict(response=callback)
,cookies = request_params['cookies'] ,cookies = request_params['cookies']
,timeout = settings.timeout
) )
else: else:
req = grequests.post(request_params['url'] req = grequests.post(request_params['url']
,data=request_params['data'] ,data = request_params['data']
,headers=request_params['headers'] ,headers = request_params['headers']
,hooks=dict(response=callback) ,hooks = dict(response=callback)
,cookies = request_params['cookies'] ,cookies = request_params['cookies']
,timeout = settings.timeout
) )
requests.append(req) requests.append(req)
grequests.map(requests) grequests.map(requests)

4
searx/settings.py
View File

@ -3,7 +3,9 @@ port = 8888
secret_key = "ultrasecretkey" # change this! secret_key = "ultrasecretkey" # change this!
debug = False debug = True
request_timeout = 5.0 # seconds
weights = {} # 'search_engine_name': float(weight) | default is 1.0 weights = {} # 'search_engine_name': float(weight) | default is 1.0