rsmp 0.11.4 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3632282c6b535bc3d2355f4f572bea3179729dc89b3afa34f92aa57853e6e437
-  data.tar.gz: e64e7695d2b41f5f6c297b0c1a56c72ce8fb0bc5415f42e6026af5a8ae826dbe
+  metadata.gz: 85f5c9ffaa15773f1f5e6722bd93fcf8ecff524166859bafec85e6871a285330
+  data.tar.gz: 90f8edb63fb20d324885c9e9b15c5bde49bcbdc80086fa48c36fd4c78b183475
 SHA512:
-  metadata.gz: c543a2e50e6894edeb003432050fae0b1ee9f8cc14814139156cf861ccc02d32b48b3fbec513723d610d453626330ea471bbdf0e937ccf28a80bb38d8ef3310a
-  data.tar.gz: 6d2e410152c264582d89efe5f08fe2f314d5848e4bc00bcc37d4e017e0cf85c17955f3604297a7972cdbfb55899105994a12206e996b92368fe53d826e02c0ab
+  metadata.gz: 01c22ef28ddbaedcf45d7c24518d1cf9ffe190f434c0e8e0e07a9e7d12f6333ea5ccc16f2532502755d1efa6619e9a2c7d73e462aeed9ea75f93deb55e4cb0ab
+  data.tar.gz: ebca1461398deacd9ff211e0bbc24c4586e286d46806c8b62718a36eaf41b5b53c2cef5a6f1882b81d4009778172a0173bf390812478e47bca86927465bde179

data/Gemfile.lock

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

data/lib/rsmp/collect/state_collector.rb

@@ -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,12 +204,11 @@ module RSMP
     end
 
     def notify_error e, options={}
-      node.notify_error e, options
+      @node.notify_error e, options
     end
 
     def start_watchdog
       log "Starting watchdog with interval #{@site_settings['intervals']['watchdog']} seconds", level: :debug
-      send_watchdog
       @watchdog_started = true
     end
 
@@ -369,7 +369,7 @@ module RSMP
     end
 
     def process_deferred
-      node.process_deferred
+      @node.process_deferred
     end
 
     def verify_sequence message
@@ -419,7 +419,7 @@ module RSMP
       close
       message
     ensure
-      node.clear_deferred
+      @node.clear_deferred
     end
 
     def process_message message
@@ -620,12 +620,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
@@ -47,7 +47,8 @@ module RSMP
     def handshake_complete
       super
       sanitized_sxl_version = RSMP::Schemer.sanitize_version(@site_sxl_version)
-      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :info
+      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :log
+      start_watchdog
     end
 
     def process_message message
@@ -91,6 +92,20 @@ module RSMP
       @version_determined = true
     end
 
+    def acknowledged_first_ingoing message
+      case message.type
+      when "Watchdog"
+        send_watchdog
+      end
+    end
+
+    def acknowledged_first_outgoing message
+      case message.type
+      when "Watchdog"
+        handshake_complete
+      end
+    end
+
     def validate_ready action
       raise NotReady.new("Can't #{action} because connection is not ready. (Currently #{@state})") unless ready?
     end
@@ -152,14 +167,10 @@ module RSMP
     end
 
     def version_acknowledged
-      handshake_complete
     end
 
     def process_watchdog message
       super
-      if @watchdog_started == false
-        start_watchdog
-      end
     end
 
     def site_ids_changed

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
@@ -86,10 +82,11 @@ module RSMP
     end
 
     def handshake_complete
-      super
       sanitized_sxl_version = RSMP::Schemer.sanitize_version(sxl_version)
       log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sanitized_sxl_version}", level: :info
       start_watchdog
+      send_all_aggregated_status if @site_settings['send_after_connect']
+      super
     end
 
     def process_message message
@@ -124,10 +121,8 @@ module RSMP
       # aggregateds status should only be send for later version of rsmp
       # to handle verison differences, we probably need inherited classes
       case message.type
-        when "Watchdog"
-          if @site_settings['send_after_connect']
-            send_all_aggregated_status
-          end
+      when "Watchdog"
+        handshake_complete
       end
     end
 
@@ -152,8 +147,8 @@ module RSMP
       log "Received Version message, using RSMP #{@rsmp_version}", message: message, level: :log
       start_timer
       acknowledge message
-      handshake_complete
       @version_determined = true
+      send_watchdog
     end
 
     def send_aggregated_status component, options={}

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.11.4"
+  VERSION = "0.11.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.7
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async