songkick_queue 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c907eaed6febf237e49b8ff56171ecdd09976fe1
-  data.tar.gz: ac2c3f1207df01dd24623fef5de6492c1b8016ff
+  metadata.gz: 80c905f63588a612193bdeaade449945a882915d
+  data.tar.gz: 9efbed0c8e48ab683f5d3a201ce5f185a64b4cd8
 SHA512:
-  metadata.gz: 0c1f1c1cd6b38341badd1b4a0065278730ed6caac7193c4d1c35a374076cd0151bad596eb0b00b7abbba312ae67fe5ff6619978b54e176cdee0e372ce8f02702
-  data.tar.gz: 3d21e628d13199e1467e8bb483432ec6abfe31fbfde4cda5858693450ec1faea565fe1848eb83ddfa2376c4f843739cb8ca0842cba285a9254629b65d01671b5
+  metadata.gz: 35eb58b4c453ca4a5516e675d3753bd6a8ee7d9cb4c543f0999b8050b329c681c0e58eb8a4eca8b3de7edd443a11527132e2631fc2ceab6bae1f4ac27dc10dfc
+  data.tar.gz: 50c7cc654906e5fa6544ffed3ebb4cb924b885df011a86dabca80cc0faef97ec28fbf8c03dab82abc1be9dc2c968209caff4cffc909ce03049d0c2b30e7f2b0f

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 script: bundle exec rspec
 rvm:
-  - 2.2.0
-  - 2.1.0
-  - 2.0.0
+  - 2.3.1
+  - 2.2.2

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.0.0
+### Added
+- Configuration option: `requeue_rejected_messages`
+
+### Changed
+- Changed default consumer behaviour for errors; we now reject on failure and re-queue according to new config option `requeue_rejected_messages` (defaults to false)
+
 ## 0.6.0
 ### Added
 - Instrumentation (for tracking metrics using statsd or other tools)

data/README.md

@@ -42,6 +42,7 @@ SongkickQueue.configure do |config|
   config.vhost = '/'
   config.max_reconnect_attempts = 10
   config.network_recovery_interval = 1.0
+  config.requeue_rejected_messages = false
 end
 ```
 
@@ -170,8 +171,7 @@ $ open http://localhost:8808/
 
 ## TODO
 
-* Add a message UUID when publishing (add to process name when processing)
-* Look at adding #requeue and #reject methods in consumer mixin
+* Requeue and reject from within consumers
 
 ## Contributing
 

data/lib/songkick_queue.rb

@@ -22,6 +22,7 @@ module SongkickQueue
     :vhost,
     :max_reconnect_attempts,
     :network_recovery_interval,
+    :requeue_rejected_messages,
   )
 
   TooManyReconnectAttemptsError = Class.new(StandardError)
@@ -35,6 +36,7 @@ module SongkickQueue
       config.port = 5672
       config.max_reconnect_attempts = 10
       config.network_recovery_interval = 1.0
+      config.requeue_rejected_messages = false
     end
   end
 

data/lib/songkick_queue/version.rb

@@ -1,3 +1,3 @@
 module SongkickQueue
-  VERSION = "0.6.0"
+  VERSION = "1.0.0"
 end

data/lib/songkick_queue/worker.rb

@@ -103,9 +103,11 @@ module SongkickQueue
       end
     rescue Object => exception
       logger.error(exception)
+      channel.reject(delivery_info.delivery_tag, config.requeue_rejected_messages)
+    else
+      channel.ack(delivery_info.delivery_tag, false)
     ensure
       set_process_name
-      channel.ack(delivery_info.delivery_tag, false)
     end
 
     def channel

data/spec/songkick_queue/worker_spec.rb

@@ -65,24 +65,26 @@ module SongkickQueue
     end
 
     describe "#process_message" do
-      it "should instantiate the consumer and call #process" do
+      let(:worker) { Worker.new(:process_name, BarConsumer) }
+      let(:logger) { double(:logger, info: :null) }
+      let(:channel) { double(:channel, ack: :null, reject: :null) }
+      let(:delivery_info) { double(:delivery_info, delivery_tag: 'tag') }
+      let(:consumer) { double(BarConsumer, process: :null) }
+      let(:config) { double(:config, requeue_rejected_messages: true) }
+
+      before do
         ::BarConsumer = Struct.new(:delivery_info, :logger) do
           def self.queue_name
             "bar-queue"
           end
         end
-        worker = Worker.new(:process_name, BarConsumer)
 
-        logger = double(:logger, info: :null)
         allow(worker).to receive(:logger) { logger }
-
-        channel = double(:channel, ack: :null)
         allow(worker).to receive(:channel) { channel }
+        allow(worker).to receive(:config) { config }
+      end
 
-        delivery_info = double(:delivery_info, delivery_tag: 'tag')
-
-        consumer = double(BarConsumer, process: :null)
-
+      it "should instantiate the consumer and call #process" do
         expect(BarConsumer).to receive(:new)
           .with(delivery_info, logger) { consumer }
 
@@ -95,9 +97,32 @@ module SongkickQueue
 
         expect(logger).to have_received(:info)
           .with('Processing message 92c583bdc248 via BarConsumer, produced at 2015-03-30T15:41:55Z')
+      end
+
+      it "should acknowedge the message if it is successful" do
+        expect(BarConsumer).to receive(:new)
+          .with(delivery_info, logger) { consumer }
+
+        worker.send(:process_message, BarConsumer, delivery_info, :properties,
+          '{"message_id":"92c583bdc248","produced_at":"2015-03-30T15:41:55Z",' +
+          '"payload":{"example":"message","value":true}}')
 
         expect(channel).to have_received(:ack).with('tag', false)
       end
+
+      it "should reject and re-queue the message if it is not successful" do
+        expect(BarConsumer).to receive(:new)
+          .with(delivery_info, logger) { consumer }
+
+        allow(consumer).to receive(:process) { raise RuntimeError, "test error" }
+        expect(logger).to receive(:error).with(instance_of(RuntimeError))
+
+        worker.send(:process_message, BarConsumer, delivery_info, :properties,
+          '{"message_id":"92c583bdc248","produced_at":"2015-03-30T15:41:55Z",' +
+          '"payload":{"example":"message","value":true}}')
+
+        expect(channel).to have_received(:reject).with('tag', true)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: songkick_queue
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Dan Lucraft
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem for processing tasks asynchronously, powered by RabbitMQ.