protobuf-nats 0.9.0.pre2 → 0.9.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7b7a2ede49bfda45aadc50f2cc978e9ac6f4780
-  data.tar.gz: a6a6253219abc6417bcf87079da8d61694dfe941
+  metadata.gz: 22955c5ba9df8f9ad52ea33c197fd740cdfe8434
+  data.tar.gz: ff0dc5ef47d11178b7f8960030f025a389f2024c
 SHA512:
-  metadata.gz: 3a6d7bc54084e79bf44ab56e1847823b37523eca4be6587509cf2a22682bdffd86ea25a574acac65a2e7e0dd92e04a1a173e0230a0b3ca02da1bad02db107400
-  data.tar.gz: a25d3136a2c8767f13fc163f298f905d69f19970db022ccdee4ee8baffaea402a54448770a822fa5b58218936f6e3e84406a8fc316aa0fc6360e17932be9c3eb
+  metadata.gz: 9e75e969b3ce1561a4d402931147e5a8b4e52d09b47e36c3809694d3069b4f47c2d304771b5dd3167c44ab44e283af9000458aec6ddf6f018525f5b24dbeb70e
+  data.tar.gz: 340adf7236b84ec9f1d9a519a03d64ef0e31dcacbbecdd5bfa856db078608c70bd4571b4a02569095a3243933bccf76ab8025e11519d5dc4f61e795401f750af

data/README.md

@@ -76,6 +76,12 @@ An example config looks like this:
     tls_client_key: "/path/to/client-key.pem"
     tls_ca_cert: "/path/to/ca.pem"
     connect_timeout: 2
+    server_subscription_key_only_subscribe_to_when_includes_any_of:
+      - "search"
+      - "create"
+    server_subscription_key_do_not_subscribe_to_when_includes_any_of:
+      - "old_search"
+      - "old_create"
     subscription_key_replacements:
       - "original_service": "replacement_service"
 ```

data/lib/protobuf/nats/client.rb

@@ -126,6 +126,9 @@ module Protobuf
       end
 
       def send_request
+        # This will ensure the client is started.
+        ::Protobuf::Nats.start_client_nats_connection
+
         if use_subscription_pooling?
           available = self.class.subscription_pool.instance_variable_get("@available")
           ::ActiveSupport::Notifications.instrument "client.subscription_pool_available_size.protobuf-nats", available.length

data/lib/protobuf/nats/config.rb

@@ -4,7 +4,10 @@ require "yaml"
 module Protobuf
   module Nats
     class Config
-      attr_accessor :uses_tls, :servers, :connect_timeout, :tls_client_cert, :tls_client_key, :tls_ca_cert, :max_reconnect_attempts, :subscription_key_replacements
+      attr_accessor :uses_tls, :servers, :connect_timeout, :tls_client_cert, :tls_client_key, :tls_ca_cert, :max_reconnect_attempts
+      attr_accessor :server_subscription_key_do_not_subscribe_to_when_includes_any_of,
+                    :server_subscription_key_only_subscribe_to_when_includes_any_of,
+                    :subscription_key_replacements
 
       CONFIG_MUTEX = ::Mutex.new
 
@@ -16,6 +19,8 @@ module Protobuf
         :tls_client_key => nil,
         :tls_ca_cert => nil,
         :uses_tls => false,
+        :server_subscription_key_do_not_subscribe_to_when_includes_any_of => [],
+        :server_subscription_key_only_subscribe_to_when_includes_any_of => [],
         :subscription_key_replacements => [],
       }.freeze
 
@@ -62,6 +67,8 @@ module Protobuf
             tls_client_key: tls_client_key,
             tls_ca_cert: tls_ca_cert,
             connect_timeout: connect_timeout,
+            server_subscription_key_do_not_subscribe_to_when_includes_any_of: server_subscription_key_do_not_subscribe_to_when_includes_any_of,
+            server_subscription_key_only_subscribe_to_when_includes_any_of: server_subscription_key_only_subscribe_to_when_includes_any_of,
             subscription_key_replacements: subscription_key_replacements,
           }
           options[:tls] = {:context => new_tls_context} if uses_tls

data/lib/protobuf/nats/jnats.rb

@@ -13,7 +13,7 @@ end
 module Protobuf
   module Nats
     class JNats
-      attr_reader :connection
+      attr_reader :connection, :options
 
       class Message
         attr_reader :data, :subject, :reply
@@ -30,11 +30,14 @@ module Protobuf
         @on_reconnect_cb = lambda {}
         @on_disconnect_cb = lambda {}
         @on_close_cb = lambda {}
+        @options = nil
         @subz_cbs = {}
         @subz_mutex = ::Mutex.new
       end
 
       def connect(options = {})
+        @options ||= options
+
         servers = options[:servers] || ["nats://localhost:4222"]
         servers = [servers].flatten.map { |uri_string| java.net.URI.new(uri_string) }
         connection_factory = ::Java::IoNatsClient::ConnectionFactory.new
@@ -68,9 +71,16 @@ module Protobuf
         @connection
       end
 
-      # Do not depend on #close for a greaceful disconnect.
+      def connection
+        return @connection unless @connection.nil?
+        # Ensure no consumer or supervisor are running
+        close
+        connect(options || {})
+      end
+
+      # Do not depend on #close for a graceful disconnect.
       def close
-        @connection.close
+        @connection.close rescue nil
         @connection = nil
         @supervisor.kill rescue nil
         @supervisor = nil
@@ -79,7 +89,7 @@ module Protobuf
       end
 
       def flush(timeout_sec = 0.5)
-        @connection.flush(timeout_sec * 1000)
+        connection.flush(timeout_sec * 1000)
       end
 
       def next_message(sub, timeout_sec)
@@ -90,7 +100,7 @@ module Protobuf
 
       def publish(subject, data, mailbox = nil)
         # The "true" here is to force flush. May not need this.
-        @connection.publish(subject, mailbox, data.to_java_bytes, true)
+        connection.publish(subject, mailbox, data.to_java_bytes, true)
       end
 
       def subscribe(subject, options = {}, &block)
@@ -100,8 +110,8 @@ module Protobuf
         # We pass our work queue for processing async work because java nats
         # uses a cahced thread pool: 1 thread per async subscription.
         # Sync subs need their own queue so work is not processed async.
-        work_queue = block.nil? ? @connection.createMsgChannel : @work_queue
-        sub = @connection.subscribe(subject, queue, nil, work_queue)
+        work_queue = block.nil? ? connection.createMsgChannel : @work_queue
+        sub = connection.subscribe(subject, queue, nil, work_queue)
 
         # Register the block callback. We only lock to save the callback.
         if block

data/lib/protobuf/nats/server.rb

@@ -80,6 +80,24 @@ module Protobuf
         was_enqueued
       end
 
+      def do_not_subscribe_to_includes?(subscription_key)
+        return false unless ::Protobuf::Nats.config.server_subscription_key_do_not_subscribe_to_when_includes_any_of.respond_to?(:any?)
+        return false if ::Protobuf::Nats.config.server_subscription_key_do_not_subscribe_to_when_includes_any_of.empty?
+
+        ::Protobuf::Nats.config.server_subscription_key_do_not_subscribe_to_when_includes_any_of.any? do |key|
+          subscription_key.include?(key)
+        end
+      end
+
+      def only_subscribe_to_includes?(subscription_key)
+        return true unless ::Protobuf::Nats.config.server_subscription_key_only_subscribe_to_when_includes_any_of.respond_to?(:any?)
+        return true if ::Protobuf::Nats.config.server_subscription_key_only_subscribe_to_when_includes_any_of.empty?
+
+        ::Protobuf::Nats.config.server_subscription_key_only_subscribe_to_when_includes_any_of.any? do |key|
+          subscription_key.include?(key)
+        end
+      end
+
       def pause_file_path
         ::ENV.fetch("PB_NATS_SERVER_PAUSE_FILE_PATH", nil)
       end
@@ -108,9 +126,12 @@ module Protobuf
         service_klasses.each do |service_klass|
           service_klass.rpcs.each do |service_method, _|
             # Skip services that are not implemented.
-            next unless service_klass.method_defined? service_method
+            next unless service_klass.method_defined?(service_method)
+            subscription_key = ::Protobuf::Nats.subscription_key(service_klass, service_method)
+            next if do_not_subscribe_to_includes?(subscription_key)
+            next unless only_subscribe_to_includes?(subscription_key)
 
-            yield ::Protobuf::Nats.subscription_key(service_klass, service_method)
+            yield subscription_key
           end
         end
       end

data/lib/protobuf/nats/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module Nats
-    VERSION = "0.9.0.pre2"
+    VERSION = "0.9.0.pre3"
   end
 end

data/lib/protobuf/nats.rb

@@ -78,43 +78,40 @@ module Protobuf
     end
 
     def self.start_client_nats_connection
-      @start_client_nats_connection ||= begin
-        GET_CONNECTED_MUTEX.synchronize do
-          break true if @client_nats_connection
-          break true if @start_client_nats_connection
-
-          # Disable publisher pending buffer on reconnect
-          options = config.connection_options.merge(:disable_reconnect_buffer => true)
-
-          begin
-            @client_nats_connection = NatsClient.new
-            @client_nats_connection.connect(options)
-          rescue ::Protobuf::Nats::Errors::IOException
-            @client_nats_connection = nil
-            raise
-          end
-
-          # Ensure we have a valid connection to the NATS server.
-          @client_nats_connection.flush(5)
-
-          @client_nats_connection.on_disconnect do
-            logger.warn("Client NATS connection was disconnected")
-          end
-
-          @client_nats_connection.on_reconnect do
-            logger.warn("Client NATS connection was reconnected")
-          end
-
-          @client_nats_connection.on_close do
-            logger.warn("Client NATS connection was closed")
-          end
-
-          @client_nats_connection.on_error do |error|
-            notify_error_callbacks(error)
-          end
-
-          true
+      return true if @start_client_nats_connection && @client_nats_connection
+
+      GET_CONNECTED_MUTEX.synchronize do
+        break true if @client_nats_connection
+        break true if @start_client_nats_connection
+
+        # Disable publisher pending buffer on reconnect
+        options = config.connection_options.merge(:disable_reconnect_buffer => true)
+
+        client = NatsClient.new
+        client.connect(options)
+
+        # Ensure we have a valid connection to the NATS server.
+        client.flush(5)
+
+        client.on_disconnect do
+          logger.warn("Client NATS connection was disconnected")
+        end
+
+        client.on_reconnect do
+          logger.warn("Client NATS connection was reconnected")
         end
+
+        client.on_close do
+          logger.warn("Client NATS connection was closed")
+        end
+
+        client.on_error do |error|
+          notify_error_callbacks(error)
+        end
+
+        @client_nats_connection = client
+
+        true
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-nats
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre2
+  version: 0.9.0.pre3
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport