Merge dca79ed into c4188ac

mattermost · Feb 8, 2017 · 89f0633 · 89f0633
2 parents c4188ac + dca79ed
commit 89f0633
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/config/config.json b/config/config.json
@@ -37,7 +37,8 @@
         "EnableCustomEmoji": false,
         "RestrictCustomEmojiCreation": "all",
         "TimeBetweenUserTypingUpdatesMilliseconds": 5000,
-        "EnableUserTypingMessages": true
+        "EnableUserTypingMessages": true,
+        "ClusterLogTimeoutMilliseconds": 2000
     },
     "TeamSettings": {
         "SiteName": "Mattermost",

diff --git a/einterfaces/metrics.go b/einterfaces/metrics.go
@@ -17,6 +17,9 @@ type MetricsInterface interface {
 	IncrementHttpError()
 	ObserveHttpRequestDuration(elapsed float64)
 
+	IncrementClusterRequest()
+	ObserveClusterRequestDuration(elapsed float64)
+
 	IncrementLogin()
 	IncrementLoginFail()
 

diff --git a/model/config.go b/model/config.go
@@ -94,6 +94,7 @@ type ServiceSettings struct {
 	RestrictCustomEmojiCreation              *string
 	TimeBetweenUserTypingUpdatesMilliseconds *int64
 	EnableUserTypingMessages                 *bool
+	ClusterLogTimeoutMilliseconds            *int
 }
 
 type ClusterSettings struct {
@@ -1058,6 +1059,11 @@ func (o *Config) SetDefaults() {
 		*o.ServiceSettings.EnableUserTypingMessages = true
 	}
 
+	if o.ServiceSettings.ClusterLogTimeoutMilliseconds == nil {
+		o.ServiceSettings.ClusterLogTimeoutMilliseconds = new(int)
+		*o.ServiceSettings.ClusterLogTimeoutMilliseconds = 2000
+	}
+
 	o.defaultWebrtcSettings()
 }