Browse Source

[enh] request timeout added

asciimoo 11 years ago
parent
commit
a8797839a1
2 changed files with 10 additions and 6 deletions
  1. 7 5
      searx/engines/__init__.py
  2. 3 1
      searx/settings.py

+ 7 - 5
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)

+ 3 - 1
searx/settings.py

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