diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-27 19:41:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-27 19:41:23 +0000 |
| commit | dfad12ed0d1eaf4e61b63cced4a844b4b584e90f (patch) | |
| tree | 2fa51b824c88caa6d20f180dbffc469d814a1b2b /lib | |
| parent | 585e6aa5b20b31b1de01f7c5aa9aea67d7a377f4 (diff) | |
| parent | 758e020019860c611237e23a8898fa59c9bca5eb (diff) | |
| download | gitlab-ce-dfad12ed0d1eaf4e61b63cced4a844b4b584e90f.tar.gz | |
Merge branch 'backport-system-check-fix' into 'master'
Make the SimpleExecutor rescue exceptions in the executing Checks
See merge request !12487
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/system_check/simple_executor.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/system_check/simple_executor.rb b/lib/system_check/simple_executor.rb index dc2d4643a01..e5986612908 100644 --- a/lib/system_check/simple_executor.rb +++ b/lib/system_check/simple_executor.rb @@ -75,6 +75,8 @@ module SystemCheck check.show_error end + rescue StandardError => e + $stdout.puts "Exception: #{e.message}".color(:red) end private |