Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ GEM
psych (5.2.2)
date
stringio
puma (6.4.3)
puma (7.0.2)
nio4r (~> 2.0)
raabro (1.4.0)
racc (1.8.1)
Expand Down Expand Up @@ -203,7 +203,7 @@ DEPENDENCIES
mocha
mysql2
pg
puma
puma (~> 7.0)
rdoc
rubocop-rails-omakase
solid_queue!
Expand Down
26 changes: 19 additions & 7 deletions lib/puma/plugin/solid_queue.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,27 @@ def start(launcher)
monitor_solid_queue
end

launcher.events.on_booted do
@solid_queue_pid = fork do
Thread.new { monitor_puma }
SolidQueue::Supervisor.start
if Gem::Version.new(Puma::Const::VERSION) < Gem::Version.new("7")
launcher.events.on_booted do
@solid_queue_pid = fork do
Thread.new { monitor_puma }
SolidQueue::Supervisor.start
end
end

launcher.events.on_stopped { stop_solid_queue }
launcher.events.on_restart { stop_solid_queue }
else
launcher.events.after_booted do
@solid_queue_pid = fork do
Thread.new { monitor_puma }
SolidQueue::Supervisor.start
end
end
end

launcher.events.on_stopped { stop_solid_queue }
launcher.events.on_restart { stop_solid_queue }
launcher.events.after_stopped { stop_solid_queue }
launcher.events.before_restart { stop_solid_queue }
end
end

private
Expand Down
2 changes: 1 addition & 1 deletion solid_queue.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "appraisal"
spec.add_development_dependency "debug", "~> 1.9"
spec.add_development_dependency "mocha"
spec.add_development_dependency "puma"
spec.add_development_dependency "puma", "~> 7.0"
spec.add_development_dependency "mysql2"
spec.add_development_dependency "pg"
spec.add_development_dependency "sqlite3"
Expand Down