Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed issue #2720 - Sometimes es takes longer as expected and will raise timeout in Zammad.

Browse source
This commit is contained in:
Martin Edenhofer 2019-08-28 11:41:04 +02:00
parent bea44638d5
commit d57ac5338e
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/search_index_backend.rb
View file

@ -21,7 +21,7 @@ info about used search index machine
{ {
json: true, json: true,
open_timeout: 8, open_timeout: 8,
read_timeout: 12, read_timeout: 14,
user: Setting.get('es_user'), user: Setting.get('es_user'),
password: Setting.get('es_password'), password: Setting.get('es_password'),
} }
@ -84,7 +84,7 @@ update processors
{ {
json: true, json: true,
open_timeout: 8, open_timeout: 8,
read_timeout: 12, read_timeout: 60,
user: Setting.get('es_user'), user: Setting.get('es_user'),
password: Setting.get('es_password'), password: Setting.get('es_password'),
} }
@ -108,7 +108,7 @@ update processors
{ {
json: true, json: true,
open_timeout: 8, open_timeout: 8,
read_timeout: 12, read_timeout: 60,
user: Setting.get('es_user'), user: Setting.get('es_user'),
password: Setting.get('es_password'), password: Setting.get('es_password'),
} }
@ -181,7 +181,7 @@ create/update/delete index
{ {
json: true, json: true,
open_timeout: 8, open_timeout: 8,
read_timeout: 30, read_timeout: 60,
user: Setting.get('es_user'), user: Setting.get('es_user'),
password: Setting.get('es_password'), password: Setting.get('es_password'),
} }
@ -219,7 +219,7 @@ add new object to search index
{ {
json: true, json: true,
open_timeout: 8, open_timeout: 8,
read_timeout: 16, read_timeout: 60,
user: Setting.get('es_user'), user: Setting.get('es_user'),
password: Setting.get('es_password'), password: Setting.get('es_password'),
} }
@ -255,7 +255,7 @@ remove whole data from index
url, url,
{ {
open_timeout: 8, open_timeout: 8,
read_timeout: 16, read_timeout: 60,
user: Setting.get('es_user'), user: Setting.get('es_user'),
password: Setting.get('es_password'), password: Setting.get('es_password'),
} }
@ -285,10 +285,12 @@ remove whole data from index
result = SearchIndexBackend.search('search query', ['User', 'Organization'], limit: limit) result = SearchIndexBackend.search('search query', ['User', 'Organization'], limit: limit)
result = SearchIndexBackend.search('search query', 'User', limit: limit) - result = SearchIndexBackend.search('search query', 'User', limit: limit)
result = SearchIndexBackend.search('search query', 'User', limit: limit, sort_by: ['updated_at'], order_by: ['desc']) result = SearchIndexBackend.search('search query', 'User', limit: limit, sort_by: ['updated_at'], order_by: ['desc'])
result = SearchIndexBackend.search('search query', 'User', limit: limit, sort_by: ['active', updated_at'], order_by: ['desc', 'desc'])
result = [ result = [
{ {
:id => 123, :id => 123,