diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
| commit | b39512ed755239198a9c294b6a45e65c05900235 (patch) | |
| tree | d234a3efade1de67c46b9e5a38ce813627726aa7 /lib/gitlab/process_management.rb | |
| parent | d31474cf3b17ece37939d20082b07f6657cc79a9 (diff) | |
Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42
Diffstat (limited to 'lib/gitlab/process_management.rb')
| -rw-r--r-- | lib/gitlab/process_management.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/process_management.rb b/lib/gitlab/process_management.rb index 25a198e4a6a..f8a1a3a97de 100644 --- a/lib/gitlab/process_management.rb +++ b/lib/gitlab/process_management.rb @@ -43,7 +43,9 @@ module Gitlab # Waits for the given process to complete using a separate thread. def self.wait_async(pid) Thread.new do - Process.wait(pid) rescue Errno::ECHILD + Process.wait(pid) + rescue StandardError + nil # There is no reason to return `Errno::ECHILD` if it catches a `TypeError` end end |