pebbles-river 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b095f1ed2b6aff2c1d4916c73503981169c7ac5a
-  data.tar.gz: f69bdbd2bc4cef2a857bc84555eb83342b1ed699
+  metadata.gz: 4c159209a9e608dd1d740057e03daea124c650de
+  data.tar.gz: eae176e284a91579da4b4cdd4e06c202080d4c52
 SHA512:
-  metadata.gz: e8e8da724df5dcaafd4d1f1acdb9a0b5dc7fa2a93e2cb01af110f5522a42b203bc011e8c2953f4f50057840cee1a9e0d1aa6a9f659c99f01a80926c67def385a
-  data.tar.gz: 49e9212ea4c0b3db87894dc15f6d9b2769e8f947f164cdcc1213dd7bf5d71321c9f27de4baccf078e0da9b85b64684baaadea8cbf9fac4fe95fe162ecaf9246c
+  metadata.gz: 2799e6e6946b0b17b3c5722008e4a1c70365b3e00eae8b9fefeaa83bb213eaf864d2934591c2f49b08103998069c62167693fd54699068aea4b688aaef4e909c
+  data.tar.gz: e658cad4bb8ec8d75235915188eda161613fdef638ae5e321f50686c8d112bf43500878a815f1f90fb33366bce6fa48b0ec6b12e49f8dd539b042e1d1c40311c

data/lib/pebbles/river/message.rb

@@ -32,6 +32,7 @@ module Pebbles
         @queue = queue
         @delivery_info = delivery_info
         @payload = self.class.deserialize_payload(content)
+        @replied = false
       end
 
       def ==(other)
@@ -45,11 +46,17 @@ module Pebbles
       end
 
       def ack
-        @queue.channel.ack(delivery_tag)
+        if !@replied && (tag = delivery_tag)
+          @queue.channel.ack(tag)
+          @replied = true
+        end
       end
 
       def nack
-        @queue.channel.nack(delivery_tag, false, true)
+        if !@replied && (tag = delivery_tag)
+          @queue.channel.nack(tag, false, true)
+          @replied = true
+        end
       end
 
     end

data/lib/pebbles/river/supervisor.rb

@@ -60,10 +60,15 @@ module Pebbles
 
         worker = Pebbles::River::Worker.new(listener, worker_options)
 
+        runner = ->() {
+          with_exception_logging do
+            worker.run
+          end
+        }
+
         name = queue_spec[:name]
         process_name = "#{@name}: queue worker: #{name}"
         logger = @logger
-
         @worker_modules.push([name, worker_count, Module.new {
           define_method :execute do
             $0 = process_name
@@ -72,7 +77,7 @@ module Pebbles
               worker.stop
               exit(0)
             end
-            worker.run
+            runner.call
           end
         }])
       end
@@ -100,14 +105,10 @@ module Pebbles
 
       # From Servolux::Server
       def run
-        ensure_workers
-      rescue => e
-        if logger.respond_to? :exception
-          logger.exception(e)
-        else
-          logger.error(e.inspect)
-          logger.error(e.backtrace.join("\n"))
+        with_exception_logging do
+          ensure_workers
         end
+        sleep 1
       end
 
       private
@@ -161,6 +162,18 @@ module Pebbles
           end
         end
 
+        def with_exception_logging(&block)
+          yield
+        rescue => e
+          if logger.respond_to? :exception
+            logger.exception(e)
+          else
+            logger.error(e.inspect)
+            logger.error(e.backtrace.join("\n"))
+          end
+          raise
+        end
+
     end
 
   end

data/lib/pebbles/river/version.rb

@@ -1,5 +1,5 @@
 module Pebbles
   module River
-    VERSION = '0.3.5'
+    VERSION = '0.3.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebbles-river
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Alexander Staubo