diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
| commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
| tree | fb69158581673816a8cd895f9d352dcb3c678b1e /config/initializers/rbtrace.rb | |
| parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'config/initializers/rbtrace.rb')
| -rw-r--r-- | config/initializers/rbtrace.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/rbtrace.rb b/config/initializers/rbtrace.rb index 6a1b71bf4bd..2359fc9f6b5 100644 --- a/config/initializers/rbtrace.rb +++ b/config/initializers/rbtrace.rb @@ -2,8 +2,8 @@ if ENV['ENABLE_RBTRACE'] Gitlab::Cluster::LifecycleEvents.on_worker_start do - # Unicorn clears out signals before it forks, so rbtrace won't work - # unless it is enabled after the fork. + # We need to require `rbtrace` in a context of a worker process. + # See https://github.com/tmm1/rbtrace/issues/56#issuecomment-648683596. require 'rbtrace' end end |