active_publisher 1.2.0.pre-java → 1.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 205bf97d0f41e320989b1399fcb27607d0a8090c67de4cefa91077b999738244
-  data.tar.gz: fb7f739ec964c77f51554d14c53afc200d1aa8adce0a5c114189dbe1943424cb
+SHA1:
+  metadata.gz: c19b632c04f16f568be2eeeeaf800ee8e1f721a7
+  data.tar.gz: b3b5d8d76bb8ef95ba311a7ef6e425dbbf0ba94c
 SHA512:
-  metadata.gz: 77f537b065063574df42f2a2926048bed6e69fc2f72608b9be5030d5af3ab78bb1c8c67ed1369911422b7b04a757191d2c5f1c5aeb1b4149518574d185306482
-  data.tar.gz: 4624d5868cc61dc97b5cbd6acd61e798f6b5c02f567f6baf3279831e79b5c0f1ed6bca90a5e1c586d4ed2bb8eb49ae73350d9d3a80bd3433ede1804a8c82a6d2
+  metadata.gz: 6b5fdb514823e21dc486f7ad9d21a673b799fdceb8c5ec67decb6a875dae4bdd96da1121c7608e0927c440739440ac02eea750fb3db8c39047ef35bb621823bf
+  data.tar.gz: 04d7c3b2fbd44f160512e9990c63b27a2724cd1dd429941475e7904475215473ae5983402ab0e02c5fb0c8394a1e9f852025394ce601e33768899dca3c919476

data/.travis.yml

@@ -3,6 +3,10 @@ rvm:
  - 2.3
  - 2.4
  - jruby-9.1.12.0
+addons:
+  apt:
+    packages:
+      - rabbitmq-server
 services:
  - rabbitmq
 sudo: false

data/lib/active_publisher.rb

@@ -35,7 +35,7 @@ module ActivePublisher
   # @param [Hash] options hash to set message parameters (e.g. headers)
   def self.publish(route, payload, exchange_name, options = {})
     with_exchange(exchange_name) do |exchange|
-      ::ActiveSupport::Notifications.instrument "message_published.active_publisher" do
+      ::ActiveSupport::Notifications.instrument "message_published.active_publisher", :route => route do
         exchange.publish(payload, publishing_options(route, options))
       end
     end
@@ -51,7 +51,7 @@ module ActivePublisher
         fail ActivePublisher::ExchangeMismatchError, "bulk publish messages must match publish_all exchange_name" if message.exchange_name != exchange_name
 
         begin
-          ::ActiveSupport::Notifications.instrument "message_published.active_publisher" do
+          ::ActiveSupport::Notifications.instrument "message_published.active_publisher", :route => message.route do
             exchange.publish(message.payload, publishing_options(message.route, message.options || {}))
           end
         rescue

data/lib/active_publisher/async/in_memory_adapter/consumer_thread.rb

@@ -101,23 +101,22 @@ module ActivePublisher
                 raise unknown_error
               ensure
                 # Always requeue anything that gets stuck.
-                queue.concat(current_messages) unless current_messages.nil?
+                queue.concat(current_messages) if current_messages && !current_messages.empty?
               end
             end
           end
         end
 
         def publish_all(channel, exchange_name, messages)
-          ::ActiveSupport::Notifications.instrument "message_published.active_publisher", :message_count => messages.size do
-            exchange = channel.topic(exchange_name)
-            messages.each do |message|
-              fail ActivePublisher::ExchangeMismatchError, "bulk publish messages must match publish_all exchange_name" if message.exchange_name != exchange_name
-
+          exchange = channel.topic(exchange_name)
+          messages.each do |message|
+            fail ::ActivePublisher::ExchangeMismatchError, "bulk publish messages must match publish_all exchange_name" if message.exchange_name != exchange_name
+            ::ActiveSupport::Notifications.instrument "message_published.active_publisher", :route => message.route, :message_count => 1 do
               options = ::ActivePublisher.publishing_options(message.route, message.options || {})
               exchange.publish(message.payload, options)
             end
-            wait_for_confirms(channel)
           end
+          wait_for_confirms(channel)
         end
 
         def wait_for_confirms(channel)

data/lib/active_publisher/async/redis_adapter.rb

@@ -1,3 +1,4 @@
+require "active_publisher"
 require "active_publisher/message"
 require "active_publisher/async/redis_adapter/consumer"
 require "multi_op_queue"
@@ -64,7 +65,7 @@ module ActivePublisher
           return unless encoded_messages.size > 0
 
           redis_pool.with do |redis|
-            redis.lpush(::ActivePublisher::Async::RedisAdapter::REDIS_LIST_KEY, encoded_messages)
+            redis.rpush(::ActivePublisher::Async::RedisAdapter::REDIS_LIST_KEY, encoded_messages)
           end
         end
       end

data/lib/active_publisher/async/redis_adapter/consumer.rb

@@ -32,8 +32,11 @@ module ActivePublisher
 
           supervisor_task.execute
         end
-      end
 
+        def size
+          queue.size
+        end
+      end
     end
   end
 end

data/lib/active_publisher/async/redis_adapter/redis_multi_pop_queue.rb

@@ -13,13 +13,14 @@ module ActivePublisher
           encoded_message = ::Marshal.dump(message)
 
           redis_pool.with do |redis|
-            redis.lpush(list_key, encoded_message)
+            redis.rpush(list_key, encoded_message)
           end
         end
 
         def concat(*messages)
           messages = messages.flatten
           messages.compact!
+          return if messages.empty?
 
           encoded_messages = []
           messages.each do |message|
@@ -27,7 +28,7 @@ module ActivePublisher
           end
 
           redis_pool.with do |redis|
-            redis.lpush(list_key, encoded_messages)
+            redis.rpush(list_key, encoded_messages)
           end
         end
 
@@ -70,20 +71,34 @@ module ActivePublisher
         end
 
         def shift(number)
-          messages = []
           number = [number, size].min
+          return [] if number <= 0
+
+          messages = []
+          multi_response = []
           redis_pool.with do |redis|
-            redis.pipelined do
-              number.times do
-                messages << redis.rpop(list_key)
-              end
+            multi_response = redis.multi do
+              redis.lrange(list_key, 0, number - 1)
+              redis.ltrim(list_key, number, -1)
             end
           end
 
+          messages = multi_response.first
+          success = multi_response.last
+          return [] if multi_response.size != 2 || success.nil?
+          return [] unless success =~ /ok/i
+
           messages = [] if messages.nil?
           messages = [messages] unless messages.respond_to?(:each)
-          messages.compact!
-          messages.map { |message| ::Marshal.load(message.value) }
+
+          shifted_messages = []
+          messages.each do |message|
+            next if message.nil?
+
+            shifted_messages << ::Marshal.load(message)
+          end
+
+          shifted_messages
         end
 
         def size

data/lib/active_publisher/version.rb

@@ -1,3 +1,3 @@
 module ActivePublisher
-  VERSION = "1.2.0.pre"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_publisher
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre
+  version: 1.2.1
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -219,12 +219,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14.1
 signing_key:
 specification_version: 4
 summary: Aims to make publishing work across MRI and jRuby painless and add some nice