Commit 6ecb6316 authored by Gabriel Mazetto's avatar Gabriel Mazetto

Fix codestyle

parent 3dda2616
...@@ -9,39 +9,34 @@ module SystemCheck ...@@ -9,39 +9,34 @@ module SystemCheck
end end
def multi_check def multi_check
puts $stdout.puts
if Gitlab::Geo.primary? if Gitlab::Geo.primary?
Gitlab::Geo.secondary_nodes.each do |node| Gitlab::Geo.secondary_nodes.each do |node|
print "* Can connect to secondary node: '#{node.url}' ... " $stdout.print "* Can connect to secondary node: '#{node.url}' ... "
check_gitlab_geo_node(node) check_gitlab_geo_node(node)
end end
end end
if Gitlab::Geo.secondary? if Gitlab::Geo.secondary?
print '* Can connect to the primary node ... ' $stdout.print '* Can connect to the primary node ... '
check_gitlab_geo_node(Gitlab::Geo.primary_node) check_gitlab_geo_node(Gitlab::Geo.primary_node)
end end
end end
def check_gitlab_geo_node(node) private
display_error = proc do |e|
puts 'no'.color(:red)
puts ' Reason:'.color(:blue)
puts " #{e.message}"
end
begin def check_gitlab_geo_node(node)
response = Net::HTTP.start(node.uri.host, node.uri.port, use_ssl: (node.uri.scheme == 'https')) do |http| response = Net::HTTP.start(node.uri.host, node.uri.port, use_ssl: (node.uri.scheme == 'https')) do |http|
http.request(Net::HTTP::Get.new(node.uri)) http.request(Net::HTTP::Get.new(node.uri))
end end
if response.code_type == Net::HTTPFound if response.code_type == Net::HTTPFound
puts 'yes'.color(:green) $stdout.puts 'yes'.color(:green)
else else
puts 'no'.color(:red) $stdout.puts 'no'.color(:red)
end end
rescue Errno::ECONNREFUSED => e rescue Errno::ECONNREFUSED => e
display_error.call(e) display_exception(e)
try_fixing_it( try_fixing_it(
'Check if the machine is online and GitLab is running', 'Check if the machine is online and GitLab is running',
...@@ -49,7 +44,7 @@ module SystemCheck ...@@ -49,7 +44,7 @@ module SystemCheck
"Make sure port and protocol are correct: '#{node.url}', or change it in Admin > Geo Nodes" "Make sure port and protocol are correct: '#{node.url}', or change it in Admin > Geo Nodes"
) )
rescue SocketError => e rescue SocketError => e
display_error.call(e) display_exception(e)
if e.cause && e.cause.message.starts_with?('getaddrinfo') if e.cause && e.cause.message.starts_with?('getaddrinfo')
try_fixing_it( try_fixing_it(
...@@ -59,7 +54,7 @@ module SystemCheck ...@@ -59,7 +54,7 @@ module SystemCheck
) )
end end
rescue OpenSSL::SSL::SSLError => e rescue OpenSSL::SSL::SSLError => e
display_error.call(e) display_exception(e)
try_fixing_it( try_fixing_it(
'If you have a self-signed CA or certificate you need to whitelist it in Omnibus' 'If you have a self-signed CA or certificate you need to whitelist it in Omnibus'
...@@ -69,9 +64,14 @@ module SystemCheck ...@@ -69,9 +64,14 @@ module SystemCheck
try_fixing_it( try_fixing_it(
'If you have a valid certificate make sure you have the full certificate chain in the pem file' 'If you have a valid certificate make sure you have the full certificate chain in the pem file'
) )
rescue Exception => e # rubocop:disable Lint/RescueException rescue StandardError => e
display_error.call(e) display_exception(e)
end end
def display_exception(exception)
$stdout.puts 'no'.color(:red)
$stdout.puts ' Reason:'.color(:blue)
$stdout.puts " #{exception.message}"
end end
end end
end end
......
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