protobuf-nats 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e444dd3193486c805f44d670ca6aceca10f7df3
-  data.tar.gz: 2f0ed9b4431fc0379f41348fca8820dc57953421
+  metadata.gz: 6da90fadf74510112e08d690f747aa2f1dbebb1e
+  data.tar.gz: dde2e57a8cdc900f029e8931cd6153b6e3bf6904
 SHA512:
-  metadata.gz: b99622db5416e0626861531c8777f9207a23b5a3afba48211db0bf312f92fee1f49e71eeca0dc5621614b6452c439c96c329546281b823c2563a41a9f167f6bd
-  data.tar.gz: a0a52c9c909f552a2b01bfce3eb0a9fc18b2fd424f99c9c8301182526dd9ea69bac3bbdab5977f3b1f06f6efe79230ceb9fe332973d921dea86439e7b94fbdbe
+  metadata.gz: 4339ab9bac17df4f2e7b5f33ef5ba93fc4c6e4896c7d84fbd319df503e3790cd6927fbc2c241779fc66c1f7c77438d9b298b923038edf9bfe017ae52274f923c
+  data.tar.gz: 71ff1d34845258b508960d7b5ca8a6ca218d02659ecf4a8513a14d9420a09d44a190a4149822679fbd37b810e6fedde89d3b4cfec56f3880832a5713cb805e70

data/lib/protobuf/nats/client.rb

@@ -9,7 +9,8 @@ module Protobuf
         # may need to override to setup connection at this stage ... may also do on load of class
         super
 
-        ::Protobuf::Nats.ensure_client_nats_connection_was_started
+        # This will ensure the client is started.
+        ::Protobuf::Nats.start_client_nats_connection
       end
 
       def close_connection

data/lib/protobuf/nats/server.rb

@@ -34,10 +34,7 @@ module Protobuf
           # Publish response.
           nats.publish(reply_id, response_data)
         end.on_error do |error|
-          logger.error error.to_s
-          if error.respond_to?(:backtrace) && error.backtrace.is_a?(::Array)
-            logger.error error.backtrace.join("\n")
-          end
+          log_error(error)
         end.execute
 
         # Publish an ACK to signal the server has picked up the work.
@@ -48,6 +45,13 @@ module Protobuf
         nil
       end
 
+      def log_error(error)
+        logger.error error.to_s
+        if error.respond_to?(:backtrace) && error.backtrace.is_a?(::Array)
+          logger.error error.backtrace.join("\n")
+        end
+      end
+
       def subscribe_to_services
         logger.info "Creating subscriptions:"
 
@@ -77,6 +81,14 @@ module Protobuf
           logger.warn "Disconnected from NATS server!"
         end
 
+        nats.on_error do |error|
+          log_error(error)
+        end
+
+        nats.on_close do
+          logger.warn "NATS connection was closed!"
+        end
+
         subscribe_to_services
 
         yield if block_given?
@@ -86,12 +98,14 @@ module Protobuf
           sleep 1
         end
 
+        logger.info "Unsubscribing from rpc routes..."
         subscriptions.each do |subscription_id|
           nats.unsubscribe(subscription_id)
         end
 
+        logger.info "Waiting up to 60 seconds for the thread pool to finish shutting down..."
         thread_pool.shutdown
-        thread_pool.wait_for_termination
+        thread_pool.wait_for_termination(60)
       ensure
         @stopped = true
       end

data/lib/protobuf/nats/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module Nats
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/protobuf/nats.rb

@@ -22,6 +22,8 @@ module Protobuf
       ACK = "\1".freeze
     end
 
+    GET_CONNECTED_MUTEX = ::Mutex.new
+
     def self.config
       @config ||= begin
         config = ::Protobuf::Nats::Config.new
@@ -40,17 +42,20 @@ module Protobuf
     end
 
     def self.start_client_nats_connection
-      @client_nats_connection = ::NATS::IO::Client.new
-      @client_nats_connection.connect(config.connection_options)
+      @start_client_nats_connection ||= begin
+        GET_CONNECTED_MUTEX.synchronize do
+          return if @start_client_nats_connection
 
-      # Ensure we have a valid connection to the NATS server.
-      @client_nats_connection.flush(5)
+          @client_nats_connection = ::NATS::IO::Client.new
+          @client_nats_connection.connect(config.connection_options)
 
-      true
-    end
+          # Ensure we have a valid connection to the NATS server.
+          @client_nats_connection.flush(5)
 
-    def self.ensure_client_nats_connection_was_started
-      @ensure_client_nats_connection_was_started ||= start_client_nats_connection
+          true
+        end
+      end
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-nats
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Brandon Dewitt