diff options
| author | George Goldberg <george@gberg.me> | 2017-07-07 17:12:14 +0100 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-07-07 12:12:14 -0400 |
| commit | 39b071bc0e620b24a9dc8b13fcd6ccf5f6732ea5 (patch) | |
| tree | 6bc32b749d4aeffdb349297055a9b54411e2bf9c /api4/elasticsearch.go | |
| parent | db2f6cf0766543b6d9e9fb4ecd10947ce60b46b9 (diff) | |
| download | chat-39b071bc0e620b24a9dc8b13fcd6ccf5f6732ea5.tar.gz chat-39b071bc0e620b24a9dc8b13fcd6ccf5f6732ea5.tar.bz2 chat-39b071bc0e620b24a9dc8b13fcd6ccf5f6732ea5.zip | |
Add optional config parameter to test elasticsearch endpoint. (#6877)
Diffstat (limited to 'api4/elasticsearch.go')
| -rw-r--r-- | api4/elasticsearch.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/api4/elasticsearch.go b/api4/elasticsearch.go index 05ef1f539..9eafec48b 100644 --- a/api4/elasticsearch.go +++ b/api4/elasticsearch.go @@ -19,12 +19,17 @@ func InitElasticsearch() { } func testElasticsearch(c *Context, w http.ResponseWriter, r *http.Request) { + cfg := model.ConfigFromJson(r.Body) + if cfg == nil { + cfg = utils.Cfg + } + if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) { c.SetPermissionError(model.PERMISSION_MANAGE_SYSTEM) return } - if err := app.TestElasticsearch(); err != nil { + if err := app.TestElasticsearch(cfg); err != nil { c.Err = err return } |