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

Allow GitLab instance to start when InfluxDB hostname cannot be resolved

Closes #24438

See merge request !11356
This commit is contained in:
Douwe Maan 2017-05-15 13:49:23 +00:00
commit f5e5afc790
2 changed files with 7 additions and 0 deletions

View File

@ -0,0 +1,4 @@
---
title: Allow GitLab instance to start when InfluxDB hostname cannot be resolved
merge_request: 11356
author:

View File

@ -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)