diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-29 04:12:34 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-30 18:12:45 +0300 |
| commit | 820923664ddf353533892f0af21ed3822508a655 (patch) | |
| tree | 6d9d02057c17bd9e4655bcf5f920543413a56365 /config | |
| parent | 036c6db81362e3eff84eefcdb8c1e72bb79ab77c (diff) | |
Make rbtrace work under unicorn
The Unicorn master resets any signal handlers and prevents rbtrace
from working properly as a result. Move the `require 'rbtrace'` call
to the Unicorn `after_fork` block and keep the initializer only for Sidekiq.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/rbtrace.rb | 4 | ||||
| -rw-r--r-- | config/unicorn.rb.example | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/config/initializers/rbtrace.rb b/config/initializers/rbtrace.rb index 3a076c99ad0..c96e6985cda 100644 --- a/config/initializers/rbtrace.rb +++ b/config/initializers/rbtrace.rb @@ -1,3 +1,5 @@ # frozen_string_literal: true -require 'rbtrace' if ENV['ENABLE_RBTRACE'] +# rbtrace needs to be included after the unicorn worker forks. +# See the after_fork block in config/unicorn.rb.example. +require 'rbtrace' if ENV['ENABLE_RBTRACE'] && Sidekiq.server? diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 220a0191160..8f2d842e5b6 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -124,6 +124,10 @@ before_fork do |server, worker| end after_fork do |server, worker| + # Unicorn clears out signals before it forks, so rbtrace won't work + # unless it is enabled after the fork. + require 'rbtrace' if ENV['ENABLE_RBTRACE'] + # per-process listener ports for debugging/admin/migrations # addr = "127.0.0.1:#{9293 + worker.nr}" # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true) |