8d2ea79 · searx · git.iko.soy

git.iko.soy/searx

[fix] searx.network: fix rare cases where LOOP is None

* searx.network.client.LOOP is initialized in a thread * searx.network.__init__ imports LOOP which may happen before the thread has initialized LOOP This commit adds a new function "searx.network.client.get_loop()" to fix this issue

commit8d2ea790de884823614e673a28edff4cf335563a authorAlexandre Flament <alex@al-f.net> dateTue 27 Apr 2021, 10:03 (6 years ago) parente3b6757

3 files changed+13−8

compare with master

unifiedsplit

searx/network/__init__.py+3−3 searx/network/client.py+6−2 searx/network/network.py+4−3

searx/network/__init__.py+3−3

@@ -9,7 +9,7 @@ import httpx

99import h2.exceptions

1010

1111from .network import get_network, initialize

12−from .client import LOOP

12+from .client import get_loop

1313from .raise_for_httperror import raise_for_httperror

1414

1515# queue.SimpleQueue: Support Python 3.6

@@ -98,7 +98,7 @@ def request(method, url, **kwargs):

9898 network = get_context_network()

9999

100100 # do request

101− future = asyncio.run_coroutine_threadsafe(network.request(method, url, **kwargs), LOOP)

101+ future = asyncio.run_coroutine_threadsafe(network.request(method, url, **kwargs), get_loop())

102102 try:

103103 response = future.result(timeout)

104104 except concurrent.futures.TimeoutError as e:

@@ -179,7 +179,7 @@ def stream(method, url, **kwargs):

179179 """

180180 q = SimpleQueue()

181181 future = asyncio.run_coroutine_threadsafe(stream_chunk_to_queue(get_network(), q, method, url, **kwargs),

182− LOOP)

182+ get_loop())

183183 chunk_or_exception = q.get()

184184 while chunk_or_exception is not None:

185185 if isinstance(chunk_or_exception, Exception):

searx/network/client.py+6−2

@@ -120,7 +120,6 @@ class AsyncHTTPTransportFixed(httpx.AsyncHTTPTransport):

120120

121121

122122def get_transport_for_socks_proxy(verify, http2, local_address, proxy_url, limit, retries):

123− global LOOP, TRANSPORT_KWARGS

124123 # support socks5h (requests compatibility):

125124 # https://requests.readthedocs.io/en/master/user/advanced/#socks

126125 # socks5:// hostname is resolved on client side

@@ -136,7 +135,7 @@ def get_transport_for_socks_proxy(verify, http2, local_address, proxy_url, limit

136135 return AsyncProxyTransportFixed(proxy_type=proxy_type, proxy_host=proxy_host, proxy_port=proxy_port,

137136 username=proxy_username, password=proxy_password,

138137 rdns=rdns,

139− loop=LOOP,

138+ loop=get_loop(),

140139 verify=verify,

141140 http2=http2,

142141 local_address=local_address,

@@ -192,6 +191,11 @@ def new_client(enable_http, verify, enable_http2,

192191 return httpx.AsyncClient(transport=transport, mounts=mounts, max_redirects=max_redirects)

193192

194193

194+def get_loop():

195+ global LOOP

196+ return LOOP

197+

198+

195199def init():

196200 # log

197201 for logger_name in ('hpack.hpack', 'hpack.table'):

searx/network/network.py+4−3

@@ -7,7 +7,7 @@ from itertools import cycle

88import httpx

10−from .client import new_client, LOOP

10+from .client import new_client, get_loop

1111

1212

1313DEFAULT_NAME = '__DEFAULT__'

@@ -291,8 +291,9 @@ def done():

291291 So Network.aclose is called here using atexit.register

292292 """

293293 try:

294− if LOOP:

295− future = asyncio.run_coroutine_threadsafe(Network.aclose_all(), LOOP)

294+ loop = get_loop()

295+ if loop:

296+ future = asyncio.run_coroutine_threadsafe(Network.aclose_all(), loop)

296297 # wait 3 seconds to close the HTTP clients

297298 future.result(3)

298299 finally: