summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-12-09 10:26:56 -0500
committerGitHub <noreply@github.com>2016-12-09 10:26:56 -0500
commit9670afed82e6c3192d230f107b836e21bb0c01a6 (patch)
treef5f13b7ce83d245b7e790dbc55c2853eb32bcc1e
parente068c1d58efe1683fd4f3ef454036734a97bc6ee (diff)
downloadchat-9670afed82e6c3192d230f107b836e21bb0c01a6.tar.gz
chat-9670afed82e6c3192d230f107b836e21bb0c01a6.tar.bz2
chat-9670afed82e6c3192d230f107b836e21bb0c01a6.zip
Adding block profiling to metrics (#4741)
-rw-r--r--config/config.json1
-rw-r--r--model/config.go10
2 files changed, 9 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json
index 0815aae30..ba6973858 100644
--- a/config/config.json
+++ b/config/config.json
@@ -231,6 +231,7 @@
},
"MetricsSettings": {
"Enable": false,
+ "BlockProfileRate": 0,
"ListenAddress": ":8067"
},
"WebrtcSettings": {
diff --git a/model/config.go b/model/config.go
index f9a1d4861..6288a036b 100644
--- a/model/config.go
+++ b/model/config.go
@@ -99,8 +99,9 @@ type ClusterSettings struct {
}
type MetricsSettings struct {
- Enable *bool
- ListenAddress *string
+ Enable *bool
+ BlockProfileRate *int
+ ListenAddress *string
}
type SSOSettings struct {
@@ -974,6 +975,11 @@ func (o *Config) SetDefaults() {
*o.ServiceSettings.Forward80To443 = false
}
+ if o.MetricsSettings.BlockProfileRate == nil {
+ o.MetricsSettings.BlockProfileRate = new(int)
+ *o.MetricsSettings.BlockProfileRate = 0
+ }
+
o.defaultWebrtcSettings()
}