totoro 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f4c7f10ea818adbe2fa42308e54e93572e70a714d744e7e71429af98fd7dbcc
-  data.tar.gz: 9168aa729f1f0aab8eb64da8b0475e9a272990d0ca7744b65f4fb5d70dcdeba3
+  metadata.gz: d5eec7c12e6dde49a945a21c48be6db1a773b28e1a1cceb5bc1dd8f63c741d15
+  data.tar.gz: 44c24808e0603cecdf0883a9df55681487830d48aecbc38ac8c8db6fac93666d
 SHA512:
-  metadata.gz: a00e4ebd5d2eb76ff624e8fdf7ceda3aaa4a3f50484651d74f1b63ab3bc5163212e85cd0cce0039d6678b827df86468c598d4277bd70b8c29982f32e6c7e911a
-  data.tar.gz: 518fd37374c5fbff31b67ecadc1a2a3bd96de078de5811e6abee644dcceb7f906380809b710ed50bcd8925d2a2596265d242749ed2d491f197cd566bd0e36cf1
+  metadata.gz: c6c8e432b961bc807045d60587983aae53e663ec8e9b78d0e92f8c3c1aa09dc583574a06a3b14c220eb573971145010940bb90e521dacd0b17bd35004738f22d
+  data.tar.gz: 067b6429ee06870dc084f4671c7581c81223d9219b6e46359e68b11545329a78a154d6b62402db99ad1e8f2bf5f386736686a010c033244f0663404dbc35c28a

data/README.md

@@ -28,6 +28,11 @@ This command will generate two files
 2. `initilizers/totoro.rb` (Rails initializer)
 3. `db/migrate/[tiemstamp]_create_totoro_failed_messages.rb` (DB migration to create messages caching table)
 
+#### if you havn't install gem delayed_jobs, then run initialization scripts
+```
+rails g delayed_job:active_record
+```
+
 #### Run DB migraion
 `rake db:migrate`
 

data/lib/generators/totoro/templates/totoro.yml

@@ -1,15 +1,16 @@
 default: &default
-  default:
-    connect:
-      host: rabbitmq
-      port: 5672
-      user: app
-      pass: app
-    queue:
-      example_queue:
-        name: real.queue.name
-        durable: true
-        clean_start: false
+  connect:
+    host: rabbitmq
+    port: 5672
+    user: app
+    pass: app
+  queue:
+    example_queue:
+      name: real.queue.name
+      durable: true
+      clean_start: false
+      manual_ack: true
+      force_ack: true
 
   custom:
     connect:

data/lib/totoro/base_worker.rb

@@ -26,6 +26,9 @@ module Totoro
         payload_hash = JSON.parse(payload).with_indifferent_access
         process(payload_hash, metadata, delivery_info)
       end
+
+      handle_usr1_n_usr2
+
       subscribe_service.channel.work_pool.join
     rescue SignalException
       puts 'Terminating process ..'
@@ -37,6 +40,16 @@ module Totoro
 
     private
 
+    def handle_usr1_n_usr2
+      %w[USR1 USR2].each do |signal|
+        Signal.trap(signal) do
+          puts "#{signal} received."
+          handler = "on_#{signal.downcase}"
+          send handler if respond_to?(handler)
+        end
+      end
+    end
+
     def config
       @config ||= Totoro::Config.new(@prefix)
     end

data/lib/totoro/config.rb

@@ -23,8 +23,16 @@ module Totoro
       @data[:queue][queue_id][:exchange]
     end
 
-    def clean_start?
-      @data[:queue][id][:clean_start]
+    def clean_start?(id)
+      !!@data[:queue][id][:clean_start]
+    end
+
+    def manual_ack?(id)
+      !!@data[:queue][id][:manual_ack]
+    end
+
+    def force_ack?(id)
+      manual_ack?(id) && !!@data[:queue][id][:force_ack]
     end
 
     def queue(id)

data/lib/totoro/services/subscribe_service.rb

@@ -8,9 +8,11 @@ module Totoro
 
     def subscribe(id)
       queue = bind_queue(id)
-      queue.purge if @config.clean_start?
-      queue.subscribe do |delivery_info, metadata, payload|
+      queue.purge if @config.clean_start?(id)
+      queue.subscribe(manual_ack: @config.manual_ack?(id)) do |delivery_info, metadata, payload|
         yield(delivery_info, metadata, payload)
+      ensure
+        channel.ack(delivery_info.delivery_tag) if @config.force_ack?(id)
       end
     end
 

data/lib/totoro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Totoro
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: totoro
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - BlockchainTech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -139,6 +139,7 @@ files:
 - lib/totoro/tasks/resend_message.rake
 - lib/totoro/utils.rb
 - lib/totoro/version.rb
+- pkg/totoro-1.0.4.gem
 - spec/spec_helper.rb
 - spec/totoro_spec.rb
 - test/rabbitmq_commands.txt