diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-15 13:49:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-15 13:49:23 +0000 |
| commit | f5e5afc7901b646ab26130893bcbccbe5452db18 (patch) | |
| tree | c41bb4a5ee947b7581838f9233846deff5db343a /lib | |
| parent | e2ffb8698751769879e21626c79f9c607a630bf5 (diff) | |
| parent | 6bc48d0e25668a6cd6810178e68adab6fca58dae (diff) | |
| download | gitlab-ce-f5e5afc7901b646ab26130893bcbccbe5452db18.tar.gz | |
Merge branch 'adam-influxdb-hostname' into 'master'
Allow GitLab instance to start when InfluxDB hostname cannot be resolved
Closes #24438
See merge request !11356
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/metrics.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/metrics.rb b/lib/gitlab/metrics.rb index c6dfa4ad9bd..cb8db2f1e9f 100644 --- a/lib/gitlab/metrics.rb +++ b/lib/gitlab/metrics.rb @@ -49,6 +49,9 @@ module Gitlab end end end + rescue Errno::EADDRNOTAVAIL, SocketError => ex + Gitlab::EnvironmentLogger.error('Cannot resolve InfluxDB address. GitLab Performance Monitoring will not work.') + Gitlab::EnvironmentLogger.error(ex) end def self.prepare_metrics(metrics) |