IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-52943] fix: enable Elasticsearch properly on restart (#23806)

Browse Source 
* fix: enable elasticsearch properly on restart

* use correct method under IsEnabled

* Empty-Commit to retrigger workflow

---------

Co-authored-by: Antonis Stamatiou <stamatiou.antonis@gmail.com>
Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Felipe Martin 2023-06-23 14:59:56 +02:00 committed by GitHub
parent 9bc22b633f
commit cad2df1259
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/channels/app/platform/searchengine.go
View File

@ -9,7 +9,7 @@ import (
)
func (ps *PlatformService) StartSearchEngine() (string, string) {
if ps.SearchEngine.ElasticsearchEngine != nil && ps.SearchEngine.ElasticsearchEngine.IsActive() {
if ps.SearchEngine.ElasticsearchEngine != nil && ps.SearchEngine.ElasticsearchEngine.IsEnabled() {
ps.Go(func() {
if err := ps.SearchEngine.ElasticsearchEngine.Start(); err != nil {
ps.Log().Error(err.Error())

4
server/platform/services/searchengine/bleveengine/bleve.go
View File

@ -219,6 +219,10 @@ func (b *BleveEngine) Stop() *model.AppError {
return b.closeIndexes()
}
func (b *BleveEngine) IsEnabled() bool {
return b.IsIndexingEnabled()
}
func (b *BleveEngine) IsActive() bool {
return atomic.LoadInt32(&b.ready) == 1
}

2
server/platform/services/searchengine/interface.go
View File

@ -17,6 +17,8 @@ type SearchEngineInterface interface {
GetPlugins() []string
UpdateConfig(cfg *model.Config)
GetName() string
// IsEnabled returns a boolean indicating whether the engine is enabled in the settings
IsEnabled() bool
IsActive() bool
IsIndexingEnabled() bool
IsSearchEnabled() bool

14
server/platform/services/searchengine/mocks/SearchEngineInterface.go
View File

@ -326,6 +326,20 @@ func (_m *SearchEngineInterface) IsAutocompletionEnabled() bool {
return r0
}
// IsEnabled provides a mock function with given fields:
func (_m *SearchEngineInterface) IsEnabled() bool {
ret := _m.Called()
var r0 bool
if rf, ok := ret.Get(0).(func() bool); ok {
r0 = rf()
} else {
r0 = ret.Get(0).(bool)
}
return r0
}
// IsIndexingEnabled provides a mock function with given fields:
func (_m *SearchEngineInterface) IsIndexingEnabled() bool {
ret := _m.Called()