From 39b071bc0e620b24a9dc8b13fcd6ccf5f6732ea5 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Fri, 7 Jul 2017 17:12:14 +0100 Subject: Add optional config parameter to test elasticsearch endpoint. (#6877) --- api4/elasticsearch.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'api4/elasticsearch.go') 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 } -- cgit v1.2.3-1-g7c22