summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2017-05-13 18:00:49 +0300
committerAdam Niedzielski <adamsunday@gmail.com>2017-05-13 18:03:25 +0300
commit6bc48d0e25668a6cd6810178e68adab6fca58dae (patch)
treeb2f0ff3dc44bb9f969d4d120bdd5986917f63b28
parent361b2b135ff020cb628f1d0617e191a8bde620bf (diff)
downloadgitlab-ce-adam-influxdb-hostname.tar.gz
Allow GitLab instance to start when InfluxDB hostname cannot be resolvedadam-influxdb-hostname
Closes #24438
-rw-r--r--changelogs/unreleased/adam-influxdb-hostname.yml4
-rw-r--r--lib/gitlab/metrics.rb3
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/adam-influxdb-hostname.yml b/changelogs/unreleased/adam-influxdb-hostname.yml
new file mode 100644
index 00000000000..ab201ae7894
--- /dev/null
+++ b/changelogs/unreleased/adam-influxdb-hostname.yml
@@ -0,0 +1,4 @@
+---
+title: Allow GitLab instance to start when InfluxDB hostname cannot be resolved
+merge_request: 11356
+author:
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)