remote_service 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b51a67d9919caa428f9325b571777557440e8630
-  data.tar.gz: 24d881e6d6e31c6fa494cf7eeb53efa43a61a2f4
+  metadata.gz: 5670ccc7120cd8fd2970afe8f7155cbd3cf821b2
+  data.tar.gz: 0266410bc964525d47300abedd34fc2eae31fe1e
 SHA512:
-  metadata.gz: aca7336d58f22d292e47b8dfaaa64efcc8801bc60ef857804f656ba67501a66353fd6ff988455db4a8bbeae4413b0e97acd6f803d0bca9ff694dd8728493ff57
-  data.tar.gz: de291a444b256e4a502cb6bb5f678ab11bab74100ce4231fc8ad992896ddd53335145fc8c6ccd19d9b72040c2bcbc51e04204feab837ecc212a58c4f2ebfd978
+  metadata.gz: 985326249c4e0e4de5924254c7312c81e937f0fd031b0c5861cec4e53a908eece2fa4f6751ae2e95830249974e9b5e005ab989c9e0919735384a86a0036e9b0d
+  data.tar.gz: 86c6592ca9dc2d9d96206c31dea4fbd75a9544b7ac00b4179abef7ed39689d20a7da8ead6fcda83082be11499763d4cf925207594c78940add2087faefdf0033

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     remote_service (0.2.0)
-      msgpack (~> 1.0)
+      msgpack (~> 0.7.4)
       nats (~> 0.8.0)
 
 GEM
@@ -13,7 +13,7 @@ GEM
     minitest (5.9.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    msgpack (1.0.0)
+    msgpack (0.7.6)
     nats (0.8.0)
       eventmachine (~> 1.2, >= 1.2.0)
     rake (10.4.2)

data/README.md

@@ -59,8 +59,8 @@ sleep(0.1) # wait for non-blocking call to execute
 puts ServiceA.all(123, keyword: 'value')
 ```
 
-# Todo
-Service worker threads
+## Todo
+Add full support for NATS configuration options.
 
 ## Contributing
 

data/lib/remote_service.rb

@@ -19,10 +19,6 @@ module RemoteService
     queue.connect(brokers, &block)
   end
 
-  def disconnect
-    Queue.instance.stop
-  end
-
   def logger
     @logger ||= begin
       logger = Logger.new(STDOUT)

data/lib/remote_service/connector/nats.rb

@@ -39,8 +39,21 @@ module RemoteService
 
       attr_reader :connection
 
+      def connect_options
+        {
+          dont_randomize_servers: true,
+          reconnect_time_wait: ENV.fetch('REMOTE_SERVICE_NATS_RECONNECT_WAIT', 0.2),
+          max_reconnect_attempts: ENV.fetch('REMOTE_SERVICE_NATS_RECONNECT_ATTEMPTS', 5),
+          servers: @brokers
+        }
+      end
+
       def connect
-        NATS.start(servers: @brokers) do |connection|
+        NATS.on_error do |error|
+          yield(nil)
+          raise Errors::ConnectionFailedError, 'Connection to NATS cluster failed'
+        end
+        NATS.start(connect_options) do |connection|
           RemoteService.logger.info "CONNECTED: #{connection.connected_server}"
           RemoteService.logger.info "SERVERS IN POOL: #{connection.server_pool.count}"
           connection.on_reconnect do
@@ -60,7 +73,8 @@ module RemoteService
             lock.unlock(connection)
           end
         end
-        lock.wait
+        connection = lock.wait.first
+        raise Errors::ConnectionFailedError, 'Connection to NATS cluster failed' unless connection
       end
     end
   end

data/lib/remote_service/errors.rb

@@ -1,5 +1,6 @@
 module RemoteService
   module Errors
+    class ConnectionFailedError < StandardError; end
     class RemoteCallError < StandardError
       attr_accessor :name, :message, :backtrace
 

data/lib/remote_service/queue.rb

@@ -37,10 +37,6 @@ module RemoteService
       @conn.publish(queue, encode(payload))
     end
 
-    def stop
-      @conn.stop
-    end
-
     private
 
     def start_service_subscriber

data/lib/remote_service/version.rb

@@ -1,3 +1,3 @@
 module RemoteService
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/remote_service.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'nats', '~> 0.8.0'
-  spec.add_runtime_dependency 'msgpack', '~> 1.0'
+  spec.add_runtime_dependency 'msgpack', '~> 0.7.4'
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_service
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Marek Galovic
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement