protobuf-nats 0.8.0 → 0.9.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37d13406765b84608feb5c1b8edc2b694dd9b51e
-  data.tar.gz: 3a26cd0d3a925426a42448761abedfa7cd4e80e5
+  metadata.gz: b965b64f467078a814cd456821efec903fcff030
+  data.tar.gz: 83f040bbc6b8d48d5421fb9f31c44278b7f5ef63
 SHA512:
-  metadata.gz: 496a65ec0285610c3c44b913af26c6457e7cdd7fae9ec925d9826dfb523a090a41809256dd39f5822bdaafe5a3f412ab21d86c9cc1f0705a9b9ea2876b4e5940
-  data.tar.gz: d5f9f0460adfd3812c236257afa98256790be5bb30029dd2756eb6c9bc8020ec146ae9406db2e8f793b2b753be87048cbb001f01317a7902733ca0f30e5ed095
+  metadata.gz: 2fce53579733468be93dece666e78ec435280fdb143d9155ea8302c43f70a4f59efcb5af8668eb5c2af85d1d415631fd5bcb2300bef8def906a3afc9ff58a7cd
+  data.tar.gz: 23bf375eeae757647bedd11c19f2b02cf70d9d4b841820003856e87c8148963e4e4ca5b446d17050beefd966c1ab109315b33f9cc3f3434a74ac336b0900e910

data/lib/protobuf/nats/client.rb

@@ -1,3 +1,4 @@
+require "connection_pool"
 require "protobuf/nats"
 require "protobuf/rpc/connectors/base"
 require "monitor"
@@ -5,6 +6,30 @@ require "monitor"
 module Protobuf
   module Nats
     class Client < ::Protobuf::Rpc::Connectors::Base
+      # Structure to hold subscription and inbox to use within pool
+      SubscriptionInbox = ::Struct.new(:subscription, :inbox) do
+        def swap(sub_inbox)
+          self.subscription = sub_inbox.subscription
+          self.inbox = sub_inbox.inbox
+        end
+      end
+
+      def self.subscription_pool
+        @subscription_pool ||= ::ConnectionPool.new(:size => subscription_pool_size, :timeout => 0.1) do
+          inbox = ::Protobuf::Nats.client_nats_connection.new_inbox
+
+          SubscriptionInbox.new(::Protobuf::Nats.client_nats_connection.subscribe(inbox), inbox)
+        end
+      end
+
+      def self.subscription_pool_size
+        @subscription_pool_size ||= if ::ENV.key?("PB_NATS_CLIENT_SUBSCRIPTION_POOL_SIZE")
+          ::ENV["PB_NATS_CLIENT_SUBSCRIPTION_POOL_SIZE"].to_i
+        else
+          0
+        end
+      end
+
       def initialize(options)
         # may need to override to setup connection at this stage ... may also do on load of class
         super
@@ -13,6 +38,32 @@ module Protobuf
         ::Protobuf::Nats.start_client_nats_connection
       end
 
+      def new_subscription_inbox
+        nats = ::Protobuf::Nats.client_nats_connection
+        inbox = nats.new_inbox
+        sub = if use_subscription_pooling?
+                nats.subscribe(inbox)
+              else
+                nats.subscribe(inbox, :max => 2)
+              end
+
+        SubscriptionInbox.new(sub, inbox)
+      end
+
+      def with_subscription
+        return_value = nil
+
+        if use_subscription_pooling?
+          self.class.subscription_pool.with do |sub_inbox|
+            return_value = yield sub_inbox
+          end
+        else
+         return_value = yield new_subscription_inbox
+        end
+
+        return_value
+      end
+
       def close_connection
         # no-op (I think for now), the connection to server is persistent
       end
@@ -69,7 +120,17 @@ module Protobuf
         end
       end
 
+      def use_subscription_pooling?
+        return @use_subscription_pooling unless @use_subscription_pooling.nil?
+        @use_subscription_pooling = self.class.subscription_pool_size > 0
+      end
+
       def send_request
+        if use_subscription_pooling?
+          available = self.class.subscription_pool.instance_variable_get("@available")
+          ::ActiveSupport::Notifications.instrument "client.pool_availble_size.protobuf-nats", available.length
+        end
+
         ::ActiveSupport::Notifications.instrument "client.request_duration.protobuf-nats" do
           send_request_through_nats
         end
@@ -96,11 +157,11 @@ module Protobuf
             sleep((interval + nack_backoff_splay)/1000.0)
             next
           end
+
           break
         end
 
         parse_response
-
       rescue ::Protobuf::Nats::Errors::IOException => error
         ::Protobuf::Nats.log_error(error)
 
@@ -137,34 +198,41 @@ module Protobuf
           timeout = opts[:timeout] || 60
 
           nats = ::Protobuf::Nats.client_nats_connection
-          inbox = nats.new_inbox
 
           # Publish to server
-          sub = nats.subscribe(inbox, :max => 2)
-          nats.publish(subject, data, inbox)
-
-          # Wait for reply
-          first_message = nats.next_message(sub, ack_timeout)
-          return :ack_timeout if first_message.nil?
-          first_message_data = first_message.data
-          return :nack if first_message_data == ::Protobuf::Nats::Messages::NACK
-
-          second_message = nats.next_message(sub, timeout)
-          second_message_data = second_message.nil? ? nil : second_message.data
-
-          # Check messages
-          response = case ::Protobuf::Nats::Messages::ACK
-                     when first_message_data then second_message_data
-                     when second_message_data then first_message_data
-                     else return :ack_timeout
-                     end
-
-          fail(::Protobuf::Nats::Errors::ResponseTimeout, subject) unless response
-
-          response
-        ensure
-          # Ensure we don't leave a subscriptiosn sitting around.
-          nats.unsubscribe(sub)
+          with_subscription do |sub_inbox|
+            begin
+              completed_request = false
+              nats.publish(subject, data, sub_inbox.inbox)
+
+              # Wait for reply
+              first_message = nats.next_message(sub_inbox.subscription, ack_timeout)
+              return :ack_timeout if first_message.nil?
+
+              first_message_data = first_message.data
+              return :nack if first_message_data == ::Protobuf::Nats::Messages::NACK
+
+              second_message = nats.next_message(sub_inbox.subscription, timeout)
+              second_message_data = second_message.nil? ? nil : second_message.data
+
+              # Check messages
+              response = case ::Protobuf::Nats::Messages::ACK
+                         when first_message_data then second_message_data
+                         when second_message_data then first_message_data
+                         else return :ack_timeout
+                         end
+
+              fail(::Protobuf::Nats::Errors::ResponseTimeout, subject) unless response
+
+              completed_request = true
+              response
+            ensure
+              if !completed_request
+                nats.unsubscribe(sub_inbox.subscription)
+                sub_inbox.swap(new_subscription_inbox) # this line replaces the sub_inbox in the connection pool if necessary
+              end
+            end
+          end
         end
 
       else

data/lib/protobuf/nats/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module Nats
-    VERSION = "0.8.0"
+    VERSION = "0.9.0.pre1"
   end
 end

data/protobuf-nats.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activesupport", ">= 3.2"
+  spec.add_runtime_dependency "connection_pool"
   spec.add_runtime_dependency "protobuf", "~> 3.7", ">= 3.7.2"
   spec.add_runtime_dependency "nats-pure"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-nats
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0.pre1
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -180,12 +194,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ruby-protobuf client/server for nats