leveret 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ae4cf9c9235692a5e6db6cca5207cf66bed135e
-  data.tar.gz: fce119a83493fcf6da93b56cfaa5f2fc1ae7d379
+  metadata.gz: 6ad5d86c738d44521e7c94d660a85cd7146c6934
+  data.tar.gz: 4df57359cff0b01b6dd58d71b0b5a10962e605c6
 SHA512:
-  metadata.gz: 67115f963e00f086452dd6e31bc6eb938f95d563dc5f422c29198689b0edb83210ea02e4329233e848a738e69f5921824c55c8578d2ea3ee26d217bcbb528d04
-  data.tar.gz: c329e5873ecb87468cd67c9df9bc950afd8fe13e221cc240c1833c52b6a44e0e03d386742915ead87703aae46bffcba375dfbb9da6e6cdd7883c96260598de06
+  metadata.gz: 4bcc8fe946aa915c5ab765a6b8cd99ead0e2254ccc88ac4852de110543d7afff7465674d5facf604c7addff393c52cea17c36b38869873778bce864d0264825e
+  data.tar.gz: 1c2033a0b4b61b3147551744f67f4e8a09dfedd09d6f66c9204a9e816f209ed285cc13fa4a08c9c5bb157b4ca7ddaedeb7cf395059e89c19e12834f259579fc4

data/lib/leveret/queue.rb

@@ -53,6 +53,7 @@ module Leveret
     #
     # @note The receiving block is responsible for acking/rejecting the message. Please see the note for more details.
     #
+    # @yieldparam channel [Bunny::Channel] RabbitMQ channel receiver should use to send ack/reject
     # @yieldparam delivery_tag [String] The identifier for this message that must be used do ack/reject the message
     # @yieldparam payload [Parameters] A deserialized version of the payload contained in the message
     #
@@ -61,7 +62,7 @@ module Leveret
       log.info "Subscribing to #{name}"
       queue.subscribe(manual_ack: true) do |delivery_info, _properties, msg|
         log.debug "Received #{msg} from #{name}"
-        yield(delivery_info.delivery_tag, deserialize_payload(msg))
+        yield(queue.channel, delivery_info.delivery_tag, deserialize_payload(msg))
       end
     end
 

data/lib/leveret/version.rb

@@ -1,3 +1,3 @@
 module Leveret
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.4".freeze
 end

data/lib/leveret/worker.rb

@@ -11,7 +11,7 @@ module Leveret
     #   @return [Array<Bunny::Consumer>] All of the actively subscribed queues
     attr_accessor :queues, :consumers
 
-    def_delegators :Leveret, :log, :channel, :configuration
+    def_delegators :Leveret, :log, :configuration
 
     # Create a new worker to process jobs from the list of queue names passed
     #
@@ -69,8 +69,8 @@ module Leveret
     # allow us to gracefully cancel these subscriptions when we need to quit.
     def start_subscriptions
       queues.map do |queue|
-        consumers << queue.subscribe do |delivery_tag, payload|
-          fork_and_run(delivery_tag, payload)
+        consumers << queue.subscribe do |channel, delivery_tag, payload|
+          fork_and_run(channel, delivery_tag, payload)
         end
       end
     end
@@ -88,19 +88,21 @@ module Leveret
     # Detach the main process from the child so we can return to the main loop without waiting for it to finish
     # processing the job.
     #
+    # @param [Bunny::Channel] channel RabbitMQ channel to send the ack message on
     # @param [String] delivery_tag The identifier that RabbitMQ uses to track the message. This will be used to ack
     #   or reject the message after processing.
     # @param [Parameters] payload The job name and parameters the job requires
-    def fork_and_run(delivery_tag, payload)
+    def fork_and_run(channel, delivery_tag, payload)
       pid = fork do
         self.process_name = 'leveret-worker-child'
         log.info "[#{delivery_tag}] Forked to child process #{pid} to run #{payload[:job]}"
 
+        Leveret.reset_connection!
         Leveret.configuration.after_fork.call
 
         result = perform_job(payload)
         log.info "[#{delivery_tag}] Job returned #{result}"
-        ack_message(delivery_tag, result)
+        ack_message(channel, delivery_tag, result)
 
         log.info "[#{delivery_tag}] Exiting child process #{pid}"
         exit!(0)
@@ -121,10 +123,11 @@ module Leveret
 
     # Sends a message back to RabbitMQ confirming the completed execution of the message
     #
+    # @param [Bunny::Channel] channel RabbitMQ channel to send the ack message on
     # @param [String] delivery_tag The identifier that RabbitMQ uses to track the message. This will be used to ack
     #   or reject the message after processing.
     # @param [Symbol] result :success, :reject or :requeue depending on how we want to acknowledge the message
-    def ack_message(delivery_tag, result)
+    def ack_message(channel, delivery_tag, result)
       if result == :reject
         log.debug "[#{delivery_tag}] Rejecting message"
         channel.reject(delivery_tag)

data/lib/leveret.rb

@@ -54,6 +54,11 @@ module Leveret
       end
     end
 
+    def reset_connection!
+      @mq_connection = nil
+      @channel = nil
+    end
+
     # Logger used throughout Leveret, see {Configuration} for config options.
     #
     # @return [Logger] Standard ruby logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leveret
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Dan Wentworth