From 5d977056f7aa216eae09a22c3baaff73546f6ff1 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 29 Dec 2014 21:31:04 +0100 Subject: Flake8 and Twitter corrections Lots of Flake8 corrections Maybe we should change the rule to allow lines of 120 chars. It seems more usable. Big twitter correction : now it outputs the words in right order... --- searx/search.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'searx/search.py') diff --git a/searx/search.py b/searx/search.py index d1d03805f..fbbf3fe41 100644 --- a/searx/search.py +++ b/searx/search.py @@ -69,11 +69,16 @@ def threaded_requests(requests): print('engine timeout: {0}'.format(th._engine_name)) - # get default reqest parameter def default_request_params(): return { - 'method': 'GET', 'headers': {}, 'data': {}, 'url': '', 'cookies': {}, 'verify': True} + 'method': 'GET', + 'headers': {}, + 'data': {}, + 'url': '', + 'cookies': {}, + 'verify': True + } # create a callback wrapper for the search engine results @@ -487,14 +492,15 @@ class Search(object): continue # append request to list - requests.append((req, request_params['url'], request_args, selected_engine['name'])) + requests.append((req, request_params['url'], + request_args, + selected_engine['name'])) if not requests: return results, suggestions, answers, infoboxes # send all search-request threaded_requests(requests) - while not results_queue.empty(): engine_name, engine_results = results_queue.get_nowait() -- cgit v1.2.3 From 299a80a1eb2eecb80f5c50da261a9eab1900b572 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 9 Jan 2015 04:13:05 +0100 Subject: [enh] using the logger --- searx/search.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'searx/search.py') diff --git a/searx/search.py b/searx/search.py index fbbf3fe41..a31d8eace 100644 --- a/searx/search.py +++ b/searx/search.py @@ -29,8 +29,11 @@ from searx.engines import ( from searx.languages import language_codes from searx.utils import gen_useragent from searx.query import Query +from searx import logger +logger = logger.getChild('search') + number_of_searches = 0 @@ -42,7 +45,7 @@ def search_request_wrapper(fn, url, engine_name, **kwargs): engines[engine_name].stats['errors'] += 1 # print engine name and specific error message - print('[E] Error with engine "{0}":\n\t{1}'.format( + logger.warning('engine crash: {0}\n\t{1}'.format( engine_name, str(e))) return @@ -66,7 +69,7 @@ def threaded_requests(requests): remaining_time = max(0.0, timeout_limit - (time() - search_start)) th.join(remaining_time) if th.isAlive(): - print('engine timeout: {0}'.format(th._engine_name)) + logger.warning('engine timeout: {0}'.format(th._engine_name)) # get default reqest parameter -- cgit v1.2.3 From 23b4a53248527a1228af13a7a4f7f380a08d1c09 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 9 Jan 2015 04:30:55 +0100 Subject: [enh] engine exception traceback --- searx/search.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'searx/search.py') diff --git a/searx/search.py b/searx/search.py index a31d8eace..f58b6167c 100644 --- a/searx/search.py +++ b/searx/search.py @@ -40,13 +40,12 @@ number_of_searches = 0 def search_request_wrapper(fn, url, engine_name, **kwargs): try: return fn(url, **kwargs) - except Exception, e: + except: # increase errors stats engines[engine_name].stats['errors'] += 1 # print engine name and specific error message - logger.warning('engine crash: {0}\n\t{1}'.format( - engine_name, str(e))) + logger.exception('engine crash: {0}'.format(engine_name)) return -- cgit v1.2.3