summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-09 20:05:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-09 20:05:40 +0000
commit3586a30ca5035c95943fd7b99809032bd0ef8505 (patch)
tree0af521d3b04633206da127d32df5168444e81fce /config
parent9fc86114fb1d573d5b1b45986472f9beee83d50d (diff)
downloadgitlab-ce-3586a30ca5035c95943fd7b99809032bd0ef8505.tar.gz
Add latest changes from gitlab-org/gitlab@12-6-stable-ee
Diffstat (limited to 'config')
-rw-r--r--config/application.rb4
-rw-r--r--config/initializers/7_prometheus_metrics.rb6
2 files changed, 10 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index cad5c8bbe76..33c1c1b90d2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -260,6 +260,10 @@ module Gitlab
caching_config_hash[:pool_timeout] = 1
end
+ # Overrides RedisCacheStore's default value of 0
+ # This makes the default value the same with Gitlab::Redis::Cache
+ caching_config_hash[:reconnect_attempts] ||= ::Redis::Client::DEFAULTS[:reconnect_attempts]
+
config.cache_store = :redis_cache_store, caching_config_hash
config.active_job.queue_adapter = :sidekiq
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb
index c14ee1458bc..383fe6493ad 100644
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -43,6 +43,9 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled?
defined?(::Prometheus::Client.reinitialize_on_pid_change) && Prometheus::Client.reinitialize_on_pid_change
Gitlab::Metrics::Samplers::RubySampler.initialize_instance(Settings.monitoring.ruby_sampler_interval).start
+ rescue IOError => e
+ Gitlab::ErrorTracking.track_exception(e)
+ Gitlab::Metrics.error_detected!
end
Gitlab::Cluster::LifecycleEvents.on_master_start do
@@ -55,6 +58,9 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled?
end
Gitlab::Metrics::RequestsRackMiddleware.initialize_http_request_duration_seconds
+ rescue IOError => e
+ Gitlab::ErrorTracking.track_exception(e)
+ Gitlab::Metrics.error_detected!
end
end