summaryrefslogtreecommitdiff
path: root/lib/system_check
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-06-14 02:39:20 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-06-14 02:39:20 +0800
commit5240bb7574d3a5ee37904018ccb17fb635916afb (patch)
treec4a2f72a70f49cdd757fb604686ceb0eabc483f1 /lib/system_check
parent7b7ba297cf64f4e5ea27234600c038c3b2fc0a6d (diff)
downloadgitlab-ce-5240bb7574d3a5ee37904018ccb17fb635916afb.tar.gz
Bring changes from EE for lib/system_check/simple_executor.rbunify-simple_executor
Diffstat (limited to 'lib/system_check')
-rw-r--r--lib/system_check/simple_executor.rb30
1 files changed, 25 insertions, 5 deletions
diff --git a/lib/system_check/simple_executor.rb b/lib/system_check/simple_executor.rb
index d268f501b4a..99c9e984107 100644
--- a/lib/system_check/simple_executor.rb
+++ b/lib/system_check/simple_executor.rb
@@ -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