Merge branch 'unify-simple_executor' into 'master'
Bring changes from EE for lib/system_check/simple_executor.rb See merge request gitlab-org/gitlab-ce!19782
This commit is contained in:
commit
5694a00ec5
1 changed files with 25 additions and 5 deletions
|
@ -43,7 +43,7 @@ module SystemCheck
|
|||
#
|
||||
# @param [SystemCheck::BaseCheck] check_klass
|
||||
def run_check(check_klass)
|
||||
$stdout.print "#{check_klass.display_name} ... "
|
||||
print_display_name(check_klass)
|
||||
|
||||
check = check_klass.new
|
||||
|
||||
|
@ -60,18 +60,18 @@ module SystemCheck
|
|||
end
|
||||
|
||||
if check.check?
|
||||
$stdout.puts check_klass.check_pass.color(:green)
|
||||
print_check_pass(check_klass)
|
||||
else
|
||||
$stdout.puts check_klass.check_fail.color(:red)
|
||||
print_check_failure(check_klass)
|
||||
|
||||
if check.can_repair?
|
||||
$stdout.print 'Trying to fix error automatically. ...'
|
||||
|
||||
if check.repair!
|
||||
$stdout.puts 'Success'.color(:green)
|
||||
print_success
|
||||
return
|
||||
else
|
||||
$stdout.puts 'Failed'.color(:red)
|
||||
print_failure
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -83,6 +83,26 @@ module SystemCheck
|
|||
|
||||
private
|
||||
|
||||
def print_display_name(check_klass)
|
||||
$stdout.print "#{check_klass.display_name} ... "
|
||||
end
|
||||
|
||||
def print_check_pass(check_klass)
|
||||
$stdout.puts check_klass.check_pass.color(:green)
|
||||
end
|
||||
|
||||
def print_check_failure(check_klass)
|
||||
$stdout.puts check_klass.check_fail.color(:red)
|
||||
end
|
||||
|
||||
def print_success
|
||||
$stdout.puts 'Success'.color(:green)
|
||||
end
|
||||
|
||||
def print_failure
|
||||
$stdout.puts 'Failed'.color(:red)
|
||||
end
|
||||
|
||||
# Prints header content for the series of checks to be executed for this component
|
||||
#
|
||||
# @param [String] component name of the component relative to the checks being executed
|
||||
|
|
Loading…
Reference in a new issue