rsmp 0.11.6 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd03d3fe9826584ad89229facf44019af119faeb363ce243d778fe09fcfe2008
-  data.tar.gz: 61b2ec5ae4ddea340e530b000a41ef0437e12ba5d93f648a6a90e38f8b621f04
+  metadata.gz: 85f5c9ffaa15773f1f5e6722bd93fcf8ecff524166859bafec85e6871a285330
+  data.tar.gz: 90f8edb63fb20d324885c9e9b15c5bde49bcbdc80086fa48c36fd4c78b183475
 SHA512:
-  metadata.gz: 3819a6d25cdbcca1fc7cd5c9df732488beb79b72eaaf15dfa8d18f117371c2527c3eb673874a98fbaddfb83c9a5257e21b78b6da88828eeaccaf36fd818f18ba
-  data.tar.gz: 8ed11618013b91ec70596027bf79b3509b5cf3e5913d4ebd12f006ecfce94894fc0fdda9455d55bd86616ef7c0f6815c400ba59b6e9277471acd40f2342ead02
+  metadata.gz: 01c22ef28ddbaedcf45d7c24518d1cf9ffe190f434c0e8e0e07a9e7d12f6333ea5ccc16f2532502755d1efa6619e9a2c7d73e462aeed9ea75f93deb55e4cb0ab
+  data.tar.gz: ebca1461398deacd9ff211e0bbc24c4586e286d46806c8b62718a36eaf41b5b53c2cef5a6f1882b81d4009778172a0173bf390812478e47bca86927465bde179

data/Gemfile.lock

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

data/lib/rsmp/proxy.rb

@@ -209,7 +209,6 @@ module RSMP
 
     def start_watchdog
       log "Starting watchdog with interval #{@site_settings['intervals']['watchdog']} seconds", level: :debug
-      send_watchdog
       @watchdog_started = true
     end
 

data/lib/rsmp/site_proxy.rb

@@ -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

@@ -82,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
@@ -120,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
 
@@ -148,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.6"
+  VERSION = "0.11.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  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