diff options
| author | Corey Hulen <corey@hulen.com> | 2017-06-19 08:44:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 08:44:04 -0700 |
| commit | 36f216cb7cb16958d98b3d77e121198596fd2213 (patch) | |
| tree | ac2a5b79494749b3dffc2f5778092f2529c98d1a /api | |
| parent | fe48987a32fbd600458edd4e81318071ae558ba4 (diff) | |
| download | chat-36f216cb7cb16958d98b3d77e121198596fd2213.tar.gz chat-36f216cb7cb16958d98b3d77e121198596fd2213.tar.bz2 chat-36f216cb7cb16958d98b3d77e121198596fd2213.zip | |
PLT-6080 moving clustering to memberlist (#6499)
* PLT-6080 adding cluster discovery service
* Adding memberlist lib
* Adding memberlist lib
* WIP
* WIP
* WIP
* WIP
* Rolling back config changes
* Fixing make file
* Fixing config for cluster
* WIP
* Fixing system console for clustering
* Fixing default config
* Fixing config
* Fixing system console for clustering
* Tweaking hub setting
* Bumping up time
* merging vendor dir
* Updating vendor dir
* Fixing unit test
* Fixing bad merge
* Remove some testing code
* Moving comment
* PLT-6868 adding db ping retry
* Removing unused loc strings
* Adding defer to cancel
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 { |