diff options
Diffstat (limited to 'api')
-rw-r--r-- | api/admin.go | 10 | ||||
-rw-r--r-- | api/context.go | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/api/admin.go b/api/admin.go index a6ced71a9..090ca0550 100644 --- a/api/admin.go +++ b/api/admin.go @@ -10,6 +10,7 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/gorilla/mux" "github.com/mattermost/platform/app" + "github.com/mattermost/platform/einterfaces" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" "github.com/mssola/user_agent" @@ -46,7 +47,7 @@ func InitAdmin() { } func getLogs(c *Context, w http.ResponseWriter, r *http.Request) { - lines, err := app.GetLogs(0, 100000) + lines, err := app.GetLogs(0, 10000) if err != nil { c.Err = err return @@ -57,6 +58,11 @@ func getLogs(c *Context, w http.ResponseWriter, r *http.Request) { func getClusterStatus(c *Context, w http.ResponseWriter, r *http.Request) { infos := app.GetClusterStatus() + + if einterfaces.GetClusterInterface() != nil { + w.Header().Set(model.HEADER_CLUSTER_ID, einterfaces.GetClusterInterface().GetClusterId()) + } + w.Write([]byte(model.ClusterInfosToJson(infos))) } @@ -107,7 +113,7 @@ func saveConfig(c *Context, w http.ResponseWriter, r *http.Request) { return } - err := app.SaveConfig(cfg) + err := app.SaveConfig(cfg, true) if err != nil { c.Err = err return diff --git a/api/context.go b/api/context.go index 33dc8b2ac..6d1e758e8 100644 --- a/api/context.go +++ b/api/context.go @@ -150,9 +150,6 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { w.Header().Set(model.HEADER_REQUEST_ID, c.RequestId) w.Header().Set(model.HEADER_VERSION_ID, fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.ClientCfgHash, utils.IsLicensed)) - if einterfaces.GetClusterInterface() != nil { - w.Header().Set(model.HEADER_CLUSTER_ID, einterfaces.GetClusterInterface().GetClusterId()) - } // Instruct the browser not to display us in an iframe unless is the same origin for anti-clickjacking if !h.isApi { |