Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
searx-engine
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
searx-engine
Commits
bce3830b
Commit
bce3830b
authored
Apr 17, 2020
by
Noémi Ványi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[fix] translate engine errors to Occitan when configured
parent
ba7c8d7b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
16 deletions
+19
-16
results.py
searx/results.py
+2
-2
search.py
searx/search.py
+5
-12
webapp.py
searx/webapp.py
+12
-2
No files found.
searx/results.py
View file @
bce3830b
...
...
@@ -345,8 +345,8 @@ class ResultContainer(object):
return
0
return
resultnum_sum
/
len
(
self
.
_number_of_results
)
def
add_unresponsive_engine
(
self
,
engine_
error
):
self
.
unresponsive_engines
.
add
(
engine_error
)
def
add_unresponsive_engine
(
self
,
engine_
name
,
error_type
,
error_message
=
None
):
self
.
unresponsive_engines
.
add
(
(
engine_name
,
error_type
,
error_message
)
)
def
add_timing
(
self
,
engine_name
,
engine_time
,
page_load_time
):
self
.
timings
.
append
({
...
...
searx/search.py
View file @
bce3830b
...
...
@@ -127,11 +127,7 @@ def search_one_offline_request_safe(engine_name, query, request_params, result_c
logger
.
exception
(
'engine {0} : invalid input : {1}'
.
format
(
engine_name
,
e
))
except
Exception
as
e
:
record_offline_engine_stats_on_error
(
engine
,
result_container
,
start_time
)
result_container
.
add_unresponsive_engine
((
engine_name
,
u'{0}: {1}'
.
format
(
gettext
(
'unexpected crash'
),
e
),
))
result_container
.
add_unresponsive_engine
(
engine_name
,
'unexpected crash'
,
str
(
e
))
logger
.
exception
(
'engine {0} : exception : {1}'
.
format
(
engine_name
,
e
))
...
...
@@ -186,24 +182,21 @@ def search_one_http_request_safe(engine_name, query, request_params, result_cont
engine
.
stats
[
'errors'
]
+=
1
if
(
issubclass
(
e
.
__class__
,
requests
.
exceptions
.
Timeout
)):
result_container
.
add_unresponsive_engine
(
(
engine_name
,
gettext
(
'timeout'
))
)
result_container
.
add_unresponsive_engine
(
engine_name
,
'timeout'
)
# requests timeout (connect or read)
logger
.
error
(
"engine {0} : HTTP requests timeout"
"(search duration : {1} s, timeout: {2} s) : {3}"
.
format
(
engine_name
,
engine_time
,
timeout_limit
,
e
.
__class__
.
__name__
))
requests_exception
=
True
elif
(
issubclass
(
e
.
__class__
,
requests
.
exceptions
.
RequestException
)):
result_container
.
add_unresponsive_engine
(
(
engine_name
,
gettext
(
'request exception'
))
)
result_container
.
add_unresponsive_engine
(
engine_name
,
'request exception'
)
# other requests exception
logger
.
exception
(
"engine {0} : requests exception"
"(search duration : {1} s, timeout: {2} s) : {3}"
.
format
(
engine_name
,
engine_time
,
timeout_limit
,
e
))
requests_exception
=
True
else
:
result_container
.
add_unresponsive_engine
((
engine_name
,
u'{0}: {1}'
.
format
(
gettext
(
'unexpected crash'
),
e
),
))
result_container
.
add_unresponsive_engine
(
engine_name
,
'unexpected crash'
,
str
(
e
))
# others errors
logger
.
exception
(
'engine {0} : exception : {1}'
.
format
(
engine_name
,
e
))
...
...
@@ -238,7 +231,7 @@ def search_multiple_requests(requests, result_container, start_time, timeout_lim
remaining_time
=
max
(
0.0
,
timeout_limit
-
(
time
()
-
start_time
))
th
.
join
(
remaining_time
)
if
th
.
isAlive
():
result_container
.
add_unresponsive_engine
(
(
th
.
_engine_name
,
gettext
(
'timeout'
))
)
result_container
.
add_unresponsive_engine
(
th
.
_engine_name
,
'timeout'
)
logger
.
warning
(
'engine timeout: {0}'
.
format
(
th
.
_engine_name
))
...
...
searx/webapp.py
View file @
bce3830b
...
...
@@ -626,7 +626,7 @@ def index():
'corrections'
:
list
(
result_container
.
corrections
),
'infoboxes'
:
result_container
.
infoboxes
,
'suggestions'
:
list
(
result_container
.
suggestions
),
'unresponsive_engines'
:
list
(
result_container
.
unresponsive_engines
)},
'unresponsive_engines'
:
__get_translated_errors
(
result_container
.
unresponsive_engines
)},
# noqa
default
=
lambda
item
:
list
(
item
)
if
isinstance
(
item
,
set
)
else
item
),
mimetype
=
'application/json'
)
elif
output_format
==
'csv'
:
...
...
@@ -694,7 +694,7 @@ def index():
corrections
=
correction_urls
,
infoboxes
=
result_container
.
infoboxes
,
paging
=
result_container
.
paging
,
unresponsive_engines
=
result_container
.
unresponsive_engines
,
unresponsive_engines
=
__get_translated_errors
(
result_container
.
unresponsive_engines
)
,
current_language
=
match_language
(
search_query
.
lang
,
LANGUAGE_CODES
,
fallback
=
request
.
preferences
.
get_value
(
"language"
)),
...
...
@@ -705,6 +705,16 @@ def index():
)
def
__get_translated_errors
(
unresponsive_engines
):
translated_errors
=
[]
for
unresponsive_engine
in
unresponsive_engines
:
error_msg
=
gettext
(
unresponsive_engine
[
1
])
if
unresponsive_engine
[
2
]:
error_msg
=
"{} {}"
.
format
(
error_msg
,
unresponsive_engine
[
2
])
translated_errors
.
append
((
unresponsive_engine
[
0
],
error_msg
))
return
translated_errors
@
app
.
route
(
'/about'
,
methods
=
[
'GET'
])
def
about
():
"""Render about page"""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment