nats 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c785185ca50a110f1e5097074eb94932875ec56f
-  data.tar.gz: fdf520606b0140c0ea01ecce19ef4a7a2e60c5fb
+  metadata.gz: 23d54c2e2890b69cdb422808a4f94a93a6cac269
+  data.tar.gz: 55c83a91c62c749121200bf33fd82d0d1fd021ac
 SHA512:
-  metadata.gz: 8caccc1be68f33b8a06385e002646ca4e9ac3bb8aea387f192a95d46978a84df8d28898f03f9b932bf9c0e7a0d9a6de9f4476041770f28b96be853f5b4fae3e1
-  data.tar.gz: 7f9280338f75b80a1088d2d5ac280efb239449de5a87987d3725883bd0257768cebb36b19ca9e2fe9b2d6e47a3be48494a73c16711e48e99a5bac672e107efb6
+  metadata.gz: a5bf18160bb411b9cff709e4d0c9bc236cbdeb2c84e28f2745e0be7bd806f010df525ffd13d7971ce6b51e51a451c066c39b6c3dfacfe2a66c2da6917e537946
+  data.tar.gz: 7257c4a1d832e49c2bcc0df2a3b4e5ad162e44d1a8062b9510dd84c8a5748c8dde7c44c9eda398fb421a7d1d62ac721488fcb17ed830d9b91fd17f192b1823eb

data/HISTORY.md

@@ -1,5 +1,16 @@
 # HISTORY
 
+## v0.8.2 (March 14, 2017)
+  - Allow setting name from client on connect (#129)
+  - Add discovered servers helper for servers announced via async INFO (#136)
+  - Add time based reconnect backoff (#139)
+  - Modify lang sent on connect when using jruby (#135)
+
+## v0.8.0 (August 10, 2016)
+  - Added cluster auto discovery handling which is supported on v0.9.2 server release (#125)
+  - Added jruby part of the build (both in openjdk and oraclejdk runtimes) (#122 #123)
+  - Fixed ping interval accounting (#120)
+
 ## v0.7.1 (July 8, 2016)
   - Remove dependencies which are no longer needed for ruby-client
   - See full list @ https://github.com/nats-io/ruby-nats/compare/v0.7.0...v0.7.1

data/README.md

@@ -3,15 +3,14 @@
 A [Ruby](http://ruby-lang.org) client for the [NATS messaging system](https://nats.io).
 
 [![License MIT](https://img.shields.io/npm/l/express.svg)](http://opensource.org/licenses/MIT)
-[![Build Status](https://travis-ci.org/nats-io/ruby-nats.svg)](http://travis-ci.org/nats-io/ruby-nats) [![Gem Version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=rb&type=5&v=0.7.1)](https://rubygems.org/gems/nats/versions/0.7.1) [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/github/nats-io/ruby-nats)
-
+[![Build Status](https://travis-ci.org/nats-io/ruby-nats.svg)](http://travis-ci.org/nats-io/ruby-nats) [![Gem Version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=rb&type=5&v=0.8.0)](https://rubygems.org/gems/nats/versions/0.8.0) [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/github/nats-io/ruby-nats)
 
 ## Supported Platforms
 
 This gem and the client are known to work on the following Ruby platforms:
 
 - MRI 1.9, 2.0, 2.1, 2.2, 2.3.0
-- JRuby 1.6.8 (experimental)
+- JRuby 9.1.2.0
 
 ## Getting Started
 
@@ -96,14 +95,36 @@ end
 opts = {
   :dont_randomize_servers => true,
   :reconnect_time_wait => 0.5,
-  :max_reconnect_attempts = 10,
+  :max_reconnect_attempts => 10,
   :servers => ['nats://127.0.0.1:4222', 'nats://127.0.0.1:4223', 'nats://127.0.0.1:4224']
 }
 
 NATS.connect(opts) do |c|
   puts "NATS is connected!"
 end
+```
+
+### Auto discovery
+
+Starting from release `0.8.0` of the gem, the client also auto discovers
+new nodes announced by the server as they attach to the cluster.
+Reconnection logic parameters such as time to back-off on failure and max attempts
+apply the same to both discovered nodes and those defined explicitly on connect:
+
+```ruby
+opts = {
+  :dont_randomize_servers => true,
+  :reconnect_time_wait => 0.5,
+  :max_reconnect_attempts => 10,
+  :servers => ['nats://127.0.0.1:4222', 'nats://127.0.0.1:4223'],
+  :user => 'secret',
+  :pass => 'deadbeef'
+}
 
+NATS.connect(opts) do |c|
+  # Confirm number of available servers in cluster.
+  puts "Connected to NATS! Servers in pool: #{c.server_pool.count}"
+end
 ```
 
 ## Advanced Usage

data/bin/nats-pub

@@ -20,7 +20,7 @@ msg ||= 'Hello World'
 
 NATS.on_error { |err| puts "Server Error: #{err}"; exit! }
 
-NATS.start(:uri => $nats_server, :autostart => true) do
+NATS.start(:uri => $nats_server) do
   NATS.publish(subject, msg) { NATS.stop }
 end
 

data/bin/nats-queue

@@ -41,7 +41,7 @@ end
 
 NATS.on_error { |err| puts "Server Error: #{err}"; exit! }
 
-NATS.start(:uri => $nats_server,  :autostart => true) do
+NATS.start(:uri => $nats_server) do
   puts "Listening on [#{subject}], queue group [#{queue_group}]" unless $show_raw
   NATS.subscribe(subject, :queue => queue_group) { |msg, _, sub|
     puts decorate(sub, msg)

data/bin/nats-request

@@ -42,7 +42,7 @@ end
 
 NATS.on_error { |err| puts "Server Error: #{err}"; exit! }
 
-NATS.start(:uri => $nats_server, :autostart => true) do
+NATS.start(:uri => $nats_server) do
   NATS.request(subject, msg) { |(msg, reply)|
     puts decorate(msg)
     exit! if $responses && ($responses-=1) < 1

data/bin/nats-sub

@@ -40,7 +40,7 @@ end
 
 NATS.on_error { |err| puts "Server Error: #{err}"; exit! }
 
-NATS.start(:uri => $nats_server, :autostart => true) do
+NATS.start(:uri => $nats_server) do
   puts "Listening on [#{subject}]" unless $show_raw
   NATS.subscribe(subject) { |msg, _, sub| puts decorate(sub, msg) }
 end

data/lib/nats/client.rb

@@ -10,7 +10,6 @@ require "#{ep}/version"
 
 module NATS
 
-  PROTOCOL_VERSION = 1
   DEFAULT_PORT = 4222
   DEFAULT_URI = "nats://localhost:#{DEFAULT_PORT}".freeze
 
@@ -519,14 +518,15 @@ module NATS
     cs = {
       :verbose => @options[:verbose],
       :pedantic => @options[:pedantic],
-      :lang => :ruby,
-      :version => VERSION,
-      :protocol => PROTOCOL_VERSION
+      :lang => ::NATS::LANG,
+      :version => ::NATS::VERSION,
+      :protocol => ::NATS::PROTOCOL_VERSION
     }
     if auth_connection?
       cs[:user] = @uri.user
       cs[:pass] = @uri.password
     end
+    cs[:name] = @options[:name] if @options[:name]
     cs[:ssl_required] = @ssl if @ssl
     cs[:tls_required] = true if @tls
 
@@ -680,7 +680,7 @@ module NATS
             u.password ||= @uri.password if @uri.password
           end
 
-          srvs << { :uri => u, :reconnect_attempts => 0 }
+          srvs << { :uri => u, :reconnect_attempts => 0, :discovered => true }
         end
       end
       srvs.shuffle! unless @options[:dont_randomize_servers]
@@ -810,7 +810,14 @@ module NATS
   end
 
   def should_delay_connect?(server)
-    server[:was_connected] && server[:reconnect_attempts] >= 0
+    case
+    when server[:was_connected]
+      server[:reconnect_attempts] >= 0
+    when server[:last_reconnect_attempt]
+      (MonotonicTime.now - server[:last_reconnect_attempt]) < @options[:reconnect_time_wait]
+    else
+      false
+    end
   end
 
   def schedule_reconnect #:nodoc:
@@ -823,7 +830,7 @@ module NATS
     # Allow notifying from which server we were disconnected,
     # but only when we didn't trigger disconnecting ourselves.
     if @disconnect_cb and connected? and not closing?
-      disconnect_cb.call(NATS::ConnectError.new(disconnect_error_string))
+      @disconnect_cb.call(NATS::ConnectError.new(disconnect_error_string))
     end
 
     # If we are closing or shouldn't reconnect, go ahead and disconnect.
@@ -889,6 +896,10 @@ module NATS
   def attempt_reconnect #:nodoc:
     @reconnect_timer = nil
     current = server_pool.first
+
+    # Snapshot time when trying to reconnect to server
+    # in order to back off for subsequent attempts.
+    current[:last_reconnect_attempt] = MonotonicTime.now
     current[:reconnect_attempts] ||= 0
     current[:reconnect_attempts] += 1
 
@@ -934,6 +945,12 @@ module NATS
     connected? ? @uri : nil
   end
 
+  # Retrieves the list of servers which have been discovered
+  # via server connect_urls announcements
+  def discovered_servers
+    server_pool.select {|s| s[:discovered] }
+  end
+
   def bind_primary #:nodoc:
     first = server_pool.first
     @uri = first[:uri]
@@ -974,4 +991,23 @@ module NATS
     "<nats client v#{NATS::VERSION}>"
   end
 
+  class MonotonicTime
+    class << self
+      case
+      when defined?(Process::CLOCK_MONOTONIC)
+        def now
+          Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        end
+      when RUBY_ENGINE == 'jruby'
+        def now
+          java.lang.System.nanoTime() / 1_000_000_000.0
+        end
+      else
+        def now
+          # Fallback to regular time behavior
+          ::Time.now.to_f
+        end
+      end
+    end
+  end
 end

data/lib/nats/version.rb

@@ -1,3 +1,6 @@
 module NATS
-  VERSION = "0.8.0".freeze
+  # NOTE: These are all announced to the server on CONNECT
+  VERSION = "0.8.2".freeze
+  LANG    = RUBY_ENGINE
+  PROTOCOL_VERSION = 1
 end

data/nats.gemspec

@@ -16,7 +16,7 @@ spec = Gem::Specification.new do |s|
 
   s.authors = ['Derek Collison']
   s.email = ['derek.collison@gmail.com']
-  s.add_dependency('eventmachine', '~> 1.2', '>= 1.2.0')
+  s.add_dependency('eventmachine', '~> 1.2', '>= 1.2')
 
   s.require_paths = ['lib']
   s.bindir = 'bin'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nats
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Derek Collison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -19,7 +19,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 description: NATS is an open-source, high-performance, lightweight cloud messaging
   system.
 email: