logo

searx

Unnamed repository; edit this file 'description' to name the repository.
commit: 357fc47811a1de5a273622881574dbde23c7cb59
parent: 5d49c15f791c3b9297bb890b28643e6c50406f35
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Sat, 31 Oct 2015 14:40:59 +0100

[fix] lock request pool generator

Diffstat:

searx/poolrequests.py | 10++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/searx/poolrequests.py b/searx/poolrequests.py @@ -1,5 +1,7 @@ import requests + from itertools import cycle +from threading import RLock from searx import settings @@ -55,9 +57,10 @@ class SessionSinglePool(requests.Session): super(SessionSinglePool, self).__init__() # reuse the same adapters - self.adapters.clear() - self.mount('https://', next(https_adapters)) - self.mount('http://', next(http_adapters)) + with RLock(): + self.adapters.clear() + self.mount('https://', next(https_adapters)) + self.mount('http://', next(http_adapters)) def close(self): """Call super, but clear adapters since there are managed globaly""" @@ -67,7 +70,6 @@ class SessionSinglePool(requests.Session): def request(method, url, **kwargs): """same as requests/requests/api.py request(...) except it use SessionSinglePool and force proxies""" - global settings session = SessionSinglePool() kwargs['proxies'] = settings['outgoing'].get('proxies', None) response = session.request(method=method, url=url, **kwargs)