Merge branch 'adam-influxdb-hostname' into 'master'

Allow GitLab instance to start when InfluxDB hostname cannot be resolved Closes #24438 See merge request !11356

Merge branch 'adam-influxdb-hostname' into 'master'
f5e5afc7 · Douwe Maan · e2ffb869 · 6bc48d0e · f5e5afc7 · f5e5afc7
Commit f5e5afc7 authored May 15, 2017 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

adam-influxdb-hostname.yml changelogs/unreleased/adam-influxdb-hostname.yml +4 -0

metrics.rb lib/gitlab/metrics.rb +3 -0

No files found.
--- a/changelogs/unreleased/adam-influxdb-hostname.yml
+++ b/changelogs/unreleased/adam-influxdb-hostname.yml
+---
+title: Allow GitLab instance to start when InfluxDB hostname cannot be resolved
+merge_request: 11356
+author:
--- 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)