Merge fd68056 into 432dc92

mattermost · Feb 9, 2017 · 8862ab5 · 8862ab5
2 parents 432dc92 + fd68056
commit 8862ab5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/config/config.json b/config/config.json
@@ -40,7 +40,9 @@
         "AllowEditPost": "always",
         "PostEditTimeLimit": 300,
         "TimeBetweenUserTypingUpdatesMilliseconds": 5000,
-        "EnableUserTypingMessages": true
+        "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
@@ -105,6 +105,7 @@ type ServiceSettings struct {
 	PostEditTimeLimit                        *int
 	TimeBetweenUserTypingUpdatesMilliseconds *int64
 	EnableUserTypingMessages                 *bool
+	ClusterLogTimeoutMilliseconds            *int
 }
 
 type ClusterSettings struct {
@@ -1084,6 +1085,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()
 }