diff options
Diffstat (limited to 'searx/network/network.py')
| -rw-r--r-- | searx/network/network.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/searx/network/network.py b/searx/network/network.py index 9954f0507..d58070f18 100644 --- a/searx/network/network.py +++ b/searx/network/network.py @@ -138,12 +138,10 @@ class Network: request = response.request status = f"{response.status_code} {response.reason_phrase}" response_line = f"{response.http_version} {status}" - if hasattr(response, "_elapsed"): - elapsed_time = f"{response.elapsed.total_seconds()} sec" - else: - elapsed_time = "stream" + content_type = response.headers.get("Content-Type") + content_type = f' ({content_type})' if content_type else '' self._logger.debug( - f'HTTP Request: {request.method} {request.url} "{response_line}" ({elapsed_time})' + f'HTTP Request: {request.method} {request.url} "{response_line}"{content_type}' ) def get_client(self, verify=None, max_redirects=None): @@ -225,12 +223,10 @@ class Network: @classmethod async def aclose_all(cls): - global NETWORKS await asyncio.gather(*[network.aclose() for network in NETWORKS.values()], return_exceptions=False) def get_network(name=None): - global NETWORKS return NETWORKS.get(name or DEFAULT_NAME) @@ -240,8 +236,6 @@ def initialize(settings_engines=None, settings_outgoing=None): from searx import settings # pylint: enable=import-outside-toplevel) - global NETWORKS - settings_engines = settings_engines or settings['engines'] settings_outgoing = settings_outgoing or settings['outgoing'] @@ -328,7 +322,6 @@ def done(): Note: since Network.aclose has to be async, it is not possible to call this method on Network.__del__ So Network.aclose is called here using atexit.register """ - global NETWORKS try: loop = get_loop() if loop: |