fluffle 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e799f809c895d2024ad5a290a8e2e9e11c163954
-  data.tar.gz: 19da9219fdcd5f4ae4d51cb28e8fc078a205ab01
+  metadata.gz: fcbc65bf0e000660ff8f037e53c1b68c6b3d08a1
+  data.tar.gz: 3af6b92dc0b05eef86d93aeb486f1e6b7ce38a66
 SHA512:
-  metadata.gz: 6439aa9ac01843f9274a8474aa1b3ac826df315ed5c7de137ca29c3dc73ccb3f7d7a3473abd125a3b1fd75e89f149f09333cc71050bb5e2a72f4888fb6775813
-  data.tar.gz: fa768fc5767527d2b5e39c17b11957830e92f0261fec6845a453a1f67d10444d874eda817a5f81a2bb4e37c69626727743efcd219ea96df3566aa0ca2d1d36af
+  metadata.gz: b92dd7c99a3f4f4e042c0c1eef05fa708f351e7274ad07cf777515d7e5eca2afab50e4f65ce5896f672501c8b0ca7a210939f631fc06c4f623526d576b7d0ee5
+  data.tar.gz: 96eb375a61005eacecbed4963da290ca32aa755e6215bf15f1f928781489cab284a6e1dab628d713a87b49105005574fcf20df80f0714c6541821f97cefadb6c

data/lib/fluffle/server.rb

@@ -22,6 +22,7 @@ module Fluffle
 
       @handlers     = {}
       @handler_pool = Concurrent::FixedThreadPool.new concurrency
+      @consumers    = []
 
       self.class.default_server ||= self
     end
@@ -66,7 +67,7 @@ module Fluffle
         qualified_name = Fluffle.request_queue_name name
         queue          = @channel.queue qualified_name
 
-        queue.subscribe(manual_ack: true) do |delivery_info, properties, payload|
+        consumer = queue.subscribe(manual_ack: true) do |delivery_info, properties, payload|
           @handler_pool.post do
             begin
               handle_request handler: handler,
@@ -80,6 +81,8 @@ module Fluffle
             end
           end
         end
+
+        @consumers << consumer
       end
 
       self.wait_for_signal
@@ -111,8 +114,10 @@ module Fluffle
 
         Fluffle.logger.info "Received #{signal}; shutting down..."
 
-        @channel.close
+        # First stop the consumers from receiving messages
+        @consumers.each &:cancel
 
+        # Then wait for worker pools to finish processing their active jobs
         @handler_pool.shutdown
         unless @handler_pool.wait_for_termination(@shutdown_timeout)
           # `wait_for_termination` returns false if it didn't shut down in time,
@@ -120,6 +125,9 @@ module Fluffle
           @handler_pool.kill
         end
 
+        # Finally close the connection
+        @channel.close
+
         return
       end
     end

data/lib/fluffle/version.rb

@@ -1,3 +1,3 @@
 module Fluffle
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluffle
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Dirk Gadsden