diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2015-12-28 18:00:32 +0100 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2015-12-28 18:00:32 +0100 |
commit | 4d925f2147884812e349031a19f0d7ced9d5fdaf (patch) | |
tree | c15476c76ec6d6f0d2522b7362dec404aecb5dd9 /config/initializers | |
parent | 540eb0a9affef14329418b32be0dcd60f2b66e29 (diff) | |
download | gitlab-ce-4d925f2147884812e349031a19f0d7ced9d5fdaf.tar.gz |
Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settings
Diffstat (limited to 'config/initializers')
-rw-r--r-- | config/initializers/metrics.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index a47d2bf59a6..2e4908192a1 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -32,10 +32,17 @@ if Gitlab::Metrics.enabled? ) Gitlab::Metrics::Instrumentation. - instrument_class_hierarchy(ActiveRecord::Base) do |_, method| - loc = method.source_location + instrument_class_hierarchy(ActiveRecord::Base) do |klass, method| + # Instrumenting the ApplicationSetting class can lead to an infinite + # loop. Since the data is cached any way we don't really need to + # instrument it. + if klass == ApplicationSetting + false + else + loc = method.source_location - loc && loc[0].start_with?(models) && method.source =~ regex + loc && loc[0].start_with?(models) && method.source =~ regex + end end end |