Commit f5e5afc7 authored by Douwe Maan's avatar Douwe Maan

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

Allow GitLab instance to start when InfluxDB hostname cannot be resolved

Closes #24438

See merge request !11356
parents e2ffb869 6bc48d0e
---
title: Allow GitLab instance to start when InfluxDB hostname cannot be resolved
merge_request: 11356
author:
...@@ -49,6 +49,9 @@ module Gitlab ...@@ -49,6 +49,9 @@ module Gitlab
end end
end 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 end
def self.prepare_metrics(metrics) def self.prepare_metrics(metrics)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment