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 View File

120
         callback = make_callback(selected_engine['name'], results, engine.response, request_params)
120
         callback = make_callback(selected_engine['name'], results, engine.response, request_params)
121
         if request_params['method'] == 'GET':
121
         if request_params['method'] == 'GET':
122
             req = grequests.get(request_params['url']
122
             req = grequests.get(request_params['url']
123
-                                ,headers=request_params['headers']
124
-                                ,hooks=dict(response=callback)
123
+                                ,headers = request_params['headers']
124
+                                ,hooks = dict(response=callback)
125
                                 ,cookies = request_params['cookies']
125
                                 ,cookies = request_params['cookies']
126
+                                ,timeout = settings.timeout
126
                                 )
127
                                 )
127
         else:
128
         else:
128
             req = grequests.post(request_params['url']
129
             req = grequests.post(request_params['url']
129
-                                ,data=request_params['data']
130
-                                ,headers=request_params['headers']
131
-                                ,hooks=dict(response=callback)
130
+                                ,data = request_params['data']
131
+                                ,headers = request_params['headers']
132
+                                ,hooks = dict(response=callback)
132
                                 ,cookies = request_params['cookies']
133
                                 ,cookies = request_params['cookies']
134
+                                ,timeout = settings.timeout
133
                                 )
135
                                 )
134
         requests.append(req)
136
         requests.append(req)
135
     grequests.map(requests)
137
     grequests.map(requests)

+ 3
- 1
searx/settings.py View File

3
 
3
 
4
 secret_key = "ultrasecretkey" # change this!
4
 secret_key = "ultrasecretkey" # change this!
5
 
5
 
6
-debug = False
6
+debug = True
7
+
8
+request_timeout = 5.0 # seconds
7
 
9
 
8
 weights = {} # 'search_engine_name': float(weight) | default is 1.0
10
 weights = {} # 'search_engine_name': float(weight) | default is 1.0
9
 
11