github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 07:51:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Improve auto-restart parent process detection logic (#13068)

Browse Source 
The auto restart logic was sending a USR2 to the parent process without checking what the parent process actually was. In some situations, it might not be the `bin/unicorn` supervisor.

This commit switches to use a global variable for the supervisor PID. This will be much less prone to unexpected behavior.
This commit is contained in:
David Taylor 2021-05-14 18:17:31 +01:00 committed by GitHub
parent 32d6d8308c
commit b6b27bc383
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/unicorn
View File

@ -87,6 +87,8 @@ end
# This is handy if you want to bind a key to restarting unicorn in dev
if dev_mode
$unicorn_dev_supervisor_pid = Process.pid # rubocop:disable Style/GlobalVars
restart = true
while restart
restart = false

5
config/initializers/000-development_reload_warnings.rb
View File

@ -12,7 +12,8 @@ if Rails.env.development? && !Rails.configuration.cache_classes && Discourse.run
]
Listen.to(*paths, only: /\.rb$/) do |modified, added, removed|
auto_restart = ENV["AUTO_RESTART"] != "0"
supervisor_pid = $unicorn_dev_supervisor_pid # rubocop:disable Style/GlobalVars
auto_restart = supervisor_pid && ENV["AUTO_RESTART"] != "0"
files = modified + added + removed
@ -25,7 +26,7 @@ if Rails.env.development? && !Rails.configuration.cache_classes && Discourse.run
message = auto_restart ? "Restarting server..." : "Server restart required. Automate this by setting AUTO_RESTART=1."
STDERR.puts "[DEV]: Edited files which are not autoloaded. #{message}"
STDERR.puts not_autoloaded.map { |path| "- #{path}".indent(7) }.join("\n")
Process.kill("USR2", Process.ppid) if auto_restart
Process.kill("USR2", supervisor_pid) if auto_restart
end
end.start
end