From aae7830d14242ac1f98232f428654c5d2c9c5eb2 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Tue, 13 Apr 2021 15:21:53 +0200 Subject: [mod] refactoring: processors Report to the user suspended engines. searx.search.processor.abstract: * manages suspend time (per network). * reports suspended time to the ResultContainer (method extend_container_if_suspended) * adds the results to the ResultContainer (method extend_container) * handles exceptions (method handle_exception) --- searx/network/network.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/network') diff --git a/searx/network/network.py b/searx/network/network.py index f50acf595..15c23d193 100644 --- a/searx/network/network.py +++ b/searx/network/network.py @@ -199,7 +199,7 @@ class Network: def get_network(name=None): global NETWORKS - return NETWORKS[name or DEFAULT_NAME] + return NETWORKS.get(name or DEFAULT_NAME) def initialize(settings_engines=None, settings_outgoing=None): -- cgit v1.2.3 From 7acd7ffc02d14d175ec2a99ba984e47d8cb65d7d Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Wed, 14 Apr 2021 17:23:15 +0200 Subject: [enh] rewrite and enhance metrics --- searx/network/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'searx/network') diff --git a/searx/network/__init__.py b/searx/network/__init__.py index dbd31c781..40665f7d6 100644 --- a/searx/network/__init__.py +++ b/searx/network/__init__.py @@ -3,7 +3,7 @@ import asyncio import threading import concurrent.futures -from time import time +from timeit import default_timer import httpx import h2.exceptions @@ -65,7 +65,7 @@ def get_context_network(): def request(method, url, **kwargs): """same as requests/requests/api.py request(...)""" - time_before_request = time() + time_before_request = default_timer() # timeout (httpx) if 'timeout' in kwargs: @@ -82,7 +82,7 @@ def request(method, url, **kwargs): timeout += 0.2 # overhead start_time = getattr(THREADLOCAL, 'start_time', time_before_request) if start_time: - timeout -= time() - start_time + timeout -= default_timer() - start_time # raise_for_error check_for_httperror = True @@ -111,7 +111,7 @@ def request(method, url, **kwargs): # update total_time. # See get_time_for_thread() and reset_time_for_thread() if hasattr(THREADLOCAL, 'total_time'): - time_after_request = time() + time_after_request = default_timer() THREADLOCAL.total_time += time_after_request - time_before_request # raise an exception -- cgit v1.2.3