summaryrefslogtreecommitdiffstats
path: root/model/config.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2017-06-19 08:44:04 -0700
committerGitHub <noreply@github.com>2017-06-19 08:44:04 -0700
commit36f216cb7cb16958d98b3d77e121198596fd2213 (patch)
treeac2a5b79494749b3dffc2f5778092f2529c98d1a /model/config.go
parentfe48987a32fbd600458edd4e81318071ae558ba4 (diff)
downloadchat-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 'model/config.go')
-rw-r--r--model/config.go51
1 files changed, 41 insertions, 10 deletions
diff --git a/model/config.go b/model/config.go
index 4e3a3f7cc..f2b17bced 100644
--- a/model/config.go
+++ b/model/config.go
@@ -163,9 +163,14 @@ type ServiceSettings struct {
}
type ClusterSettings struct {
- Enable *bool
- InterNodeListenAddress *string
- InterNodeUrls []string
+ Enable *bool
+ ClusterName *string
+ OverrideHostname *string
+ UseIpAddress *bool
+ UseExperimentalGossip *bool
+ ReadOnlyConfig *bool
+ GossipPort *int
+ StreamingPort *int
}
type MetricsSettings struct {
@@ -1036,18 +1041,44 @@ func (o *Config) SetDefaults() {
*o.ServiceSettings.PostEditTimeLimit = 300
}
- if o.ClusterSettings.InterNodeListenAddress == nil {
- o.ClusterSettings.InterNodeListenAddress = new(string)
- *o.ClusterSettings.InterNodeListenAddress = ":8075"
- }
-
if o.ClusterSettings.Enable == nil {
o.ClusterSettings.Enable = new(bool)
*o.ClusterSettings.Enable = false
}
- if o.ClusterSettings.InterNodeUrls == nil {
- o.ClusterSettings.InterNodeUrls = []string{}
+ if o.ClusterSettings.ClusterName == nil {
+ o.ClusterSettings.ClusterName = new(string)
+ *o.ClusterSettings.ClusterName = ""
+ }
+
+ if o.ClusterSettings.OverrideHostname == nil {
+ o.ClusterSettings.OverrideHostname = new(string)
+ *o.ClusterSettings.OverrideHostname = ""
+ }
+
+ if o.ClusterSettings.UseIpAddress == nil {
+ o.ClusterSettings.UseIpAddress = new(bool)
+ *o.ClusterSettings.UseIpAddress = true
+ }
+
+ if o.ClusterSettings.UseExperimentalGossip == nil {
+ o.ClusterSettings.UseExperimentalGossip = new(bool)
+ *o.ClusterSettings.UseExperimentalGossip = false
+ }
+
+ if o.ClusterSettings.ReadOnlyConfig == nil {
+ o.ClusterSettings.ReadOnlyConfig = new(bool)
+ *o.ClusterSettings.ReadOnlyConfig = true
+ }
+
+ if o.ClusterSettings.GossipPort == nil {
+ o.ClusterSettings.GossipPort = new(int)
+ *o.ClusterSettings.GossipPort = 8074
+ }
+
+ if o.ClusterSettings.StreamingPort == nil {
+ o.ClusterSettings.StreamingPort = new(int)
+ *o.ClusterSettings.StreamingPort = 8075
}
if o.MetricsSettings.ListenAddress == nil {