[MM-55595] Use annotated logger in search layer (#25468)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
5a4dba8809
Коммит
b2ec1ff8ae
@@ -7,10 +7,11 @@ import (
|
||||
"net/http"
|
||||
|
||||
"github.com/mattermost/mattermost/server/public/model"
|
||||
"github.com/mattermost/mattermost/server/public/shared/request"
|
||||
"github.com/mattermost/mattermost/server/v8/platform/services/searchengine"
|
||||
)
|
||||
|
||||
func (a *App) TestElasticsearch(cfg *model.Config) *model.AppError {
|
||||
func (a *App) TestElasticsearch(rctx request.CTX, cfg *model.Config) *model.AppError {
|
||||
if *cfg.ElasticsearchSettings.Password == model.FakeSetting {
|
||||
if *cfg.ElasticsearchSettings.ConnectionURL == *a.Config().ElasticsearchSettings.ConnectionURL && *cfg.ElasticsearchSettings.Username == *a.Config().ElasticsearchSettings.Username {
|
||||
*cfg.ElasticsearchSettings.Password = *a.Config().ElasticsearchSettings.Password
|
||||
@@ -24,7 +25,7 @@ func (a *App) TestElasticsearch(cfg *model.Config) *model.AppError {
|
||||
err := model.NewAppError("TestElasticsearch", "ent.elasticsearch.test_config.license.error", nil, "", http.StatusNotImplemented)
|
||||
return err
|
||||
}
|
||||
if err := seI.TestConfig(cfg); err != nil {
|
||||
if err := seI.TestConfig(rctx, cfg); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -35,27 +36,27 @@ func (a *App) SetSearchEngine(se *searchengine.Broker) {
|
||||
a.ch.srv.platform.SearchEngine = se
|
||||
}
|
||||
|
||||
func (a *App) PurgeElasticsearchIndexes() *model.AppError {
|
||||
func (a *App) PurgeElasticsearchIndexes(c request.CTX) *model.AppError {
|
||||
engine := a.SearchEngine().ElasticsearchEngine
|
||||
if engine == nil {
|
||||
err := model.NewAppError("PurgeElasticsearchIndexes", "ent.elasticsearch.test_config.license.error", nil, "", http.StatusNotImplemented)
|
||||
return err
|
||||
}
|
||||
|
||||
if err := engine.PurgeIndexes(); err != nil {
|
||||
if err := engine.PurgeIndexes(c); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *App) PurgeBleveIndexes() *model.AppError {
|
||||
func (a *App) PurgeBleveIndexes(c request.CTX) *model.AppError {
|
||||
engine := a.SearchEngine().BleveEngine
|
||||
if engine == nil {
|
||||
err := model.NewAppError("PurgeBleveIndexes", "searchengine.bleve.disabled.error", nil, "", http.StatusNotImplemented)
|
||||
return err
|
||||
}
|
||||
if err := engine.PurgeIndexes(); err != nil {
|
||||
if err := engine.PurgeIndexes(c); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
|
||||
Ссылка в новой задаче
Block a user