From a92fa726003880f5d28367459ddaf134c44b1697 Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Mon, 3 Oct 2016 05:38:25 +1030 Subject: Shut down the worker pool - don't kill it Different parts of concurrent-ruby's documentation make inconsistent claims about how kill will behave. It doesn't do the thing we want. --- actioncable/lib/action_cable/server/worker.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actioncable') diff --git a/actioncable/lib/action_cable/server/worker.rb b/actioncable/lib/action_cable/server/worker.rb index 7460472551..43639c27af 100644 --- a/actioncable/lib/action_cable/server/worker.rb +++ b/actioncable/lib/action_cable/server/worker.rb @@ -25,7 +25,7 @@ module ActionCable # Stop processing work: any work that has not already started # running will be discarded from the queue def halt - @executor.kill + @executor.shutdown end def stopping? -- cgit v1.2.3