diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-06 12:02:47 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-06 12:02:47 +0300 |
commit | 446c7fc6f190ac8b8bb879a2a5be37c95fafdd13 (patch) | |
tree | 0e7d39c1f7b70c71316074a3f4478293f7d27c45 /lib/system_check/app | |
parent | 6ec157264d939ca5c0a1b6c373d76aaf6edeeef1 (diff) | |
parent | 71000b394bb7ddf46d3037d62607d159706530f7 (diff) |
Merge branch 'system-checks-incoming-email' into 'master'
Move Incoming Email checks to System Checks
See merge request !14028
Diffstat (limited to 'lib/system_check/app')
-rw-r--r-- | lib/system_check/app/init_script_up_to_date_check.rb | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/lib/system_check/app/init_script_up_to_date_check.rb b/lib/system_check/app/init_script_up_to_date_check.rb index 015c7ed1731..53a47eb0f42 100644 --- a/lib/system_check/app/init_script_up_to_date_check.rb +++ b/lib/system_check/app/init_script_up_to_date_check.rb @@ -7,26 +7,22 @@ module SystemCheck set_skip_reason 'skipped (omnibus-gitlab has no init script)' def skip? - omnibus_gitlab? - end + return true if omnibus_gitlab? - def multi_check - recipe_path = Rails.root.join('lib/support/init.d/', 'gitlab') + unless init_file_exists? + self.skip_reason = "can't check because of previous errors" - unless File.exist?(SCRIPT_PATH) - $stdout.puts "can't check because of previous errors".color(:magenta) - return + true end + end + + def check? + recipe_path = Rails.root.join('lib/support/init.d/', 'gitlab') recipe_content = File.read(recipe_path) script_content = File.read(SCRIPT_PATH) - if recipe_content == script_content - $stdout.puts 'yes'.color(:green) - else - $stdout.puts 'no'.color(:red) - show_error - end + recipe_content == script_content end def show_error @@ -38,6 +34,12 @@ module SystemCheck ) fix_and_rerun end + + private + + def init_file_exists? + File.exist?(SCRIPT_PATH) + end end end end |