rsmp 0.11.3 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 429ca780c80b9fd2e2a320256f76a8d1ed37bc6f2ca2045cbebb40c537c6888a
-  data.tar.gz: 9cdb92a02f59e8ee2dd82a60e64e9b097dd6039ef2ca0e331bfe43a8e63a44e9
+  metadata.gz: dd03d3fe9826584ad89229facf44019af119faeb363ce243d778fe09fcfe2008
+  data.tar.gz: 61b2ec5ae4ddea340e530b000a41ef0437e12ba5d93f648a6a90e38f8b621f04
 SHA512:
-  metadata.gz: 35e87d762b71abb1e108b5045c05d97d024b193d683882444851e34af6dc34facffff91b6017fca83309a6f46eeec301f22530d0fd907526f417ce9b3d3b7eef
-  data.tar.gz: fde8b4459dc7cb15a08d2fa2a19584f0a47303f4591c76b390957f7b018f5704205be125d567b7648865a011a239fa52a460a9663b7b03b1daf7f5b0648eb24f
+  metadata.gz: 3819a6d25cdbcca1fc7cd5c9df732488beb79b72eaaf15dfa8d18f117371c2527c3eb673874a98fbaddfb83c9a5257e21b78b6da88828eeaccaf36fd818f18ba
+  data.tar.gz: 8ed11618013b91ec70596027bf79b3509b5cf3e5913d4ebd12f006ecfce94894fc0fdda9455d55bd86616ef7c0f6815c400ba59b6e9277471acd40f2342ead02

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.11.3)
+    rsmp (0.11.6)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)

data/lib/rsmp/collect/state_collector.rb

@@ -143,7 +143,7 @@ module RSMP
           if query.got && query.got['s']
             h[sCI][n] = { {s=>query.got['s']} => query.done? }
           else
-            h[sCI][n] = {s=>:anything}
+            h[sCI][n] = { s=>nil }
           end
         end
       end
@@ -186,19 +186,19 @@ module RSMP
       @queries.each do |query|
         want = query.want
         got = query.got
-        if got['cCI']
+        if want['cCI']
           cCI = want['cCI']
           h[cCI] ||= {}
           cO = want['cO']
           h[cCI][cO] ||= {}
           n = want['n']
-          v = got['v']
+          v = got ? got['v'] : nil
           h[cCI][cO][n] = v
         elsif want['sCI']
           sCI = want['sCI']
           h[sCI] ||= {}
           n = want['n']
-          s = got['s']
+          s = got ? got['s'] : nil
           h[sCI][n] = s
         end
       end

data/lib/rsmp/proxy.rb

@@ -13,9 +13,10 @@ module RSMP
     include Inspect
     include Task
 
-    attr_reader :state, :archive, :connection_info, :sxl, :collector, :ip, :port
+    attr_reader :state, :archive, :connection_info, :sxl, :collector, :ip, :port, :node
 
     def initialize options
+      @node = options[:node]
       initialize_logging options
       initialize_distributor
       initialize_task
@@ -120,7 +121,7 @@ module RSMP
     end
 
     def clock
-      node.clock
+      @node.clock
     end
 
     def ready?
@@ -203,7 +204,7 @@ module RSMP
     end
 
     def notify_error e, options={}
-      node.notify_error e, options
+      @node.notify_error e, options
     end
 
     def start_watchdog
@@ -369,7 +370,7 @@ module RSMP
     end
 
     def process_deferred
-      node.process_deferred
+      @node.process_deferred
     end
 
     def verify_sequence message
@@ -419,7 +420,7 @@ module RSMP
       close
       message
     ensure
-      node.clear_deferred
+      @node.clear_deferred
     end
 
     def process_message message
@@ -620,12 +621,8 @@ module RSMP
     def version_acknowledged
     end
 
-    def node
-      raise 'Must be overridden'
-    end
-
     def author
-      node.site_id
+      @node.site_id
     end
 
     def send_and_optionally_collect message, options, &block

data/lib/rsmp/site_proxy.rb

@@ -7,7 +7,7 @@ module RSMP
     attr_reader :supervisor, :site_id
 
     def initialize options
-      super options
+      super options.merge(node:options[:supervisor])
       initialize_components
       @supervisor = options[:supervisor]
       @settings = @supervisor.supervisor_settings.clone

data/lib/rsmp/supervisor_proxy.rb

@@ -8,7 +8,7 @@ module RSMP
     attr_reader :supervisor_id, :site
 
     def initialize options
-      super options
+      super options.merge(node:options[:site])
       @site = options[:site]
       @site_settings = @site.site_settings.clone
       @ip = options[:ip]
@@ -18,10 +18,6 @@ module RSMP
       @synthetic_id = Supervisor.build_id_from_ip_port @ip, @port
     end
 
-    def node
-      site
-    end
-
     # handle communication
     # if disconnected, then try to reconnect
     def run

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.11.3"
+  VERSION = "0.11.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.6
 platform: ruby
 authors:
 - Emil Tin