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 /api4 | |
| 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 'api4')
| -rw-r--r-- | api4/context.go | 3 | ||||
| -rw-r--r-- | api4/system.go | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/api4/context.go b/api4/context.go index 8d4ed7f79..7a908c588 100644 --- a/api4/context.go +++ b/api4/context.go @@ -130,9 +130,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()) - } w.Header().Set("Content-Type", "application/json") diff --git a/api4/system.go b/api4/system.go index 465f4e71d..97d8bb7dc 100644 --- a/api4/system.go +++ b/api4/system.go @@ -107,7 +107,7 @@ func updateConfig(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 |