eventq_base 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a2ac127f57aef44a90cfea420a1087cd1fcc378
-  data.tar.gz: 990a985365ea09620740ff7a649ee337d66bf308
+  metadata.gz: b9bc3112466190971bbe97e300c6f4ef72970648
+  data.tar.gz: 85a09ef777f2e608c4a2718f480f12c8354736a2
 SHA512:
-  metadata.gz: e5de8a9e071f90e0fc94bdb092ff6e66940ca6002749697a732c54bd5963d01f5ceb163fe127cf7b0b238006e4f164171803daef72e4a758513330932bc60bec
-  data.tar.gz: 1188228dd7b85272b80e68d80207aa57e93168df7b7b9b796036d9b988e4b7cf2c9d2f3f46ec8be47f204611a583d0e0399470041a2e32ad12e40cfb6005a548
+  metadata.gz: c45c1567f96f19ee6bad46b13952ba15310e8d1844d4f6ef8f05c3257ce04237e00207bb6416088c280a6c910d6396e558d4a87eac4413caa16427e90ad2c6e7
+  data.tar.gz: 71fd49d6da0e584d89fe579887af57456c85499a5b8f3308cc6521eaaa13e11dd6656c049dd530a82e889ca608b741990f3238f98b297008cab843790369944d

data/lib/eventq_base/nonce_manager.rb

@@ -19,38 +19,32 @@ module EventQ
       @lifespan
     end
 
-    def self.process(nonce, &block)
-
-      if @server_url != nil
-
-        process_with_nonce(nonce, block)
-
-      else
-
-        process_without_nonce(block)
+    def self.is_allowed?(nonce)
+      if @server_url == nil
+        return true
+      end
 
+      lock = Redlock::Client.new([ @server_url ]).lock(nonce, @timeout)
+      if lock == false
+        EventQ.log(:info, "Message has already been processed: #{nonce}")
+        return false
       end
 
       return true
-
     end
 
-    def self.process_with_nonce(nonce, block)
-      @server = Redlock::Client.new([ @server_url ])
-      @redis = Redis.new(url: @server_url)
-
-      lock = @server.lock(nonce, @timeout)
-      if lock == false
-        raise NonceError.new("Message has already been processed: #{nonce}")
+    def self.complete(nonce)
+      if @server_url != nil
+        Redis.new(url: @server_url).expire(nonce, @lifespan)
       end
-
-      block.call
-
-      @redis.expire(nonce, @lifespan)
+      return true
     end
 
-    def self.process_without_nonce(block)
-      block.call
+    def self.failed(nonce)
+      if @server_url != nil
+        Redis.new(url: @server_url).del(nonce)
+      end
+      return true
     end
 
     def self.reset

data/lib/eventq_base/version.rb

@@ -1,3 +1,3 @@
 module EventqBase
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

data/lib/eventq_base.rb

@@ -18,6 +18,5 @@ require_relative 'eventq_base/eventq_client_contract'
 require_relative 'eventq_base/configuration'
 require_relative 'eventq_base/serialization_providers'
 require_relative 'eventq_base/worker_id'
-require_relative 'eventq_base/nonce_error'
 require_relative 'eventq_base/nonce_manager'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventq_base
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - vaughanbrittonsage
@@ -154,7 +154,6 @@ files:
 - lib/eventq_base/eventq_logger.rb
 - lib/eventq_base/exchange.rb
 - lib/eventq_base/message_args.rb
-- lib/eventq_base/nonce_error.rb
 - lib/eventq_base/nonce_manager.rb
 - lib/eventq_base/queue.rb
 - lib/eventq_base/queue_message.rb

data/lib/eventq_base/nonce_error.rb

@@ -1,7 +0,0 @@
-module EventQ
-  class NonceError < StandardError
-    def initialize(message = 'Message has already been processed.')
-      super(message)
-    end
-  end
-end