nats 0.4.28 → 0.5.0.beta.12

data/lib/nats/server/server.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module NATSD #:nodoc: all
 
   # Subscriber
@@ -8,7 +10,7 @@ module NATSD #:nodoc: all
     class << self
       attr_reader :id, :info, :log_time, :auth_required, :ssl_required, :debug_flag, :trace_flag, :syslog, :options
       attr_reader :max_payload, :max_pending, :max_control_line, :auth_timeout, :ssl_timeout, :ping_interval, :ping_max
-      attr_accessor :varz, :healthz, :max_connections, :num_connections, :in_msgs, :out_msgs, :in_bytes, :out_bytes
+      attr_accessor :varz, :healthz, :connections, :max_connections, :num_connections, :in_msgs, :out_msgs, :in_bytes, :out_bytes
 
       alias auth_required? :auth_required
       alias ssl_required?  :ssl_required
@@ -36,13 +38,16 @@ module NATSD #:nodoc: all
       def setup(argv)
         process_options(argv)
 
-        @id, @cid = fast_uuid, 1
+        @id, @cid, @rid = fast_uuid, 1, 1
         @sublist = Sublist.new
 
+        @connections = {}
         @num_connections = 0
         @in_msgs = @out_msgs = 0
         @in_bytes = @out_bytes = 0
 
+        @num_routes = 0
+
         @info = {
           :server_id => Server.id,
           :host => host,
@@ -62,6 +67,7 @@ module NATSD #:nodoc: all
             # These log messages visible to controlling TTY
             log "Starting #{NATSD::APP_NAME} version #{NATSD::VERSION} on port #{NATSD::Server.port}"
             log "Starting http monitor on port #{@options[:http_port]}" if @options[:http_port]
+            log "Starting routing on port #{@options[:cluster_port]}" if @options[:cluster_port]
             log "Switching to daemon mode"
           end
           opts = {
@@ -85,12 +91,14 @@ module NATSD #:nodoc: all
         File.open(@options[:pid_file], 'w') { |f| f.puts "#{Process.pid}" } if @options[:pid_file]
       end
 
-      def subscribe(sub)
+      def subscribe(sub, is_route=false)
         @sublist.insert(sub.subject, sub)
+        broadcast_sub_to_routes(sub) unless is_route
       end
 
-      def unsubscribe(sub)
+      def unsubscribe(sub, is_route=false)
         @sublist.remove(sub.subject, sub)
+        broadcast_unsub_to_routes(sub) unless is_route
       end
 
       def deliver_to_subscriber(sub, subject, reply, msg)
@@ -119,7 +127,7 @@ module NATSD #:nodoc: all
         end
       end
 
-      def route_to_subscribers(subject, reply, msg)
+      def route_to_subscribers(subject, reply, msg, is_route=false)
         qsubs = nil
 
         # Allows nil reply to not have extra space
@@ -129,15 +137,28 @@ module NATSD #:nodoc: all
         @in_msgs += 1
         @in_bytes += msg.bytesize unless msg.nil?
 
+        # Routes
+        routes = nil
+
         @sublist.match(subject).each do |sub|
           # Skip anyone in the closing state
           next if sub.conn.closing
 
-          unless sub[:qgroup]
-            deliver_to_subscriber(sub, subject, reply, msg)
-          else
+          # Skip all routes if sourced from another route (1-hop semantics)
+          next if (is_route && sub.conn.is_route?)
+
+          if sub[:qgroup].nil?
+            if sub.conn.is_route?
+              # Only send messages once over a given route
+              routes ||= Set.new
+              deliver_to_subscriber(sub, subject, reply, msg) unless routes.include?(sub.conn.remote_rid)
+              routes << sub.conn.remote_rid
+            else
+              deliver_to_subscriber(sub, subject, reply, msg)
+            end
+          elsif !is_route
             if NATSD::Server.trace_flag?
-              trace("Matched queue subscriber", sub[:subject], sub[:qgroup], sub[:sid], sub.conn.client_info)
+              trace('Matched queue subscriber', sub[:subject], sub[:qgroup], sub[:sid], sub.conn.client_info)
             end
             # Queue this for post processing
             qsubs ||= Hash.new
@@ -152,7 +173,7 @@ module NATSD #:nodoc: all
           # Randomly pick a subscriber from the group
           sub = subs[rand*subs.size]
           if NATSD::Server.trace_flag?
-            trace("Selected queue subscriber", sub[:subject], sub[:qgroup], sub[:sid], sub.conn.client_info)
+            trace('Selected queue subscriber', sub[:subject], sub[:qgroup], sub[:sid], sub.conn.client_info)
           end
           deliver_to_subscriber(sub, subject, reply, msg)
         end
@@ -167,6 +188,10 @@ module NATSD #:nodoc: all
         @cid += 1
       end
 
+      def rid
+        @rid += 1
+      end
+
       def info_string
         @info.to_json
       end

data/lib/nats/server/varz.rb

@@ -25,6 +25,7 @@ module NATSD #:nodoc: all
         @varz[:out_msgs] = out_msgs
         @varz[:in_bytes] = in_bytes
         @varz[:out_bytes] = out_bytes
+        @varz[:routes] = num_routes
         @last_varz_update = Time.now.to_f
         varz
       end

data/nats.gemspec

@@ -16,10 +16,10 @@ spec = Gem::Specification.new do |s|
   s.authors = ['Derek Collison']
   s.email = ['derek.collison@gmail.com']
 
-  s.add_dependency('eventmachine', '= 0.12.10')
-  s.add_dependency('json_pure', '>= 1.7.3')
-  s.add_dependency('daemons', '>= 1.1.5')
-  s.add_dependency('thin', '>= 1.4.1')
+  s.add_dependency('eventmachine', '>= 1.0.3')
+  s.add_dependency('json_pure', '>= 1.8.0')
+  s.add_dependency('daemons', '>= 1.1.9')
+  s.add_dependency('thin', '>= 1.5.0')
 
   s.require_paths = ['lib']
   s.bindir = 'bin'
@@ -44,6 +44,8 @@ spec = Gem::Specification.new do |s|
     lib/nats/server.rb
     lib/nats/server/server.rb
     lib/nats/server/connection.rb
+    lib/nats/server/cluster.rb
+    lib/nats/server/route.rb
     lib/nats/server/options.rb
     lib/nats/server/sublist.rb
     lib/nats/server/const.rb

metadata

@@ -1,60 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: nats
 version: !ruby/object:Gem::Version
-  version: 0.4.28
-  prerelease: 
+  version: 0.5.0.beta.12
 platform: ruby
 authors:
 - Derek Collison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70321680098440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70321680098440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70321680097320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70321680097320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70321680096000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.9
   type: :runtime
   prerelease: false
-  version_requirements: *70321680096000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70321680095100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70321680095100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: A lightweight cloud messaging system.
 email:
 - derek.collison@gmail.com
@@ -86,6 +97,8 @@ files:
 - lib/nats/server.rb
 - lib/nats/server/server.rb
 - lib/nats/server/connection.rb
+- lib/nats/server/cluster.rb
+- lib/nats/server/route.rb
 - lib/nats/server/options.rb
 - lib/nats/server/sublist.rb
 - lib/nats/server/const.rb
@@ -94,26 +107,25 @@ files:
 - lib/nats/server/connz.rb
 homepage: http://github.com/derekcollison/nats
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A lightweight cloud messaging system.
 test_files: []