Skip to content

Commit

Permalink
Merge pull request #972 from cben/get_hostname_from_routes-sslerror
Browse files Browse the repository at this point in the history
Catch SSLError too when adding a provider
  • Loading branch information
martinpovolny authored Apr 9, 2017
2 parents 2e09e4f + 7e2bc52 commit bc446e5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/controllers/mixins/ems_common_angular.rb
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ def get_hostname_from_routes(ems, endpoint_hash, token)
client = ems.class.raw_connect(endpoint.hostname, endpoint.port,
:service => :openshift, :bearer => token, :ssl_options => ssl_options)
client.get_route('hawkular-metrics', 'openshift-infra').try(:spec).try(:host)
rescue KubeException => e
rescue KubeException, OpenSSL::SSL::SSLError => e
$log.warn("MIQ(#{controller_name}_controller-#{action_name}): get_hostname_from_routes error: #{e}")
nil
end
Expand Down

0 comments on commit bc446e5

Please sign in to comment.