rsmp 0.33.3 → 0.33.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc78c33cf43b0e3b3560966ba78d1947a3d7cbbc82937c383cab284222128260
-  data.tar.gz: 20f3c49513fb4c7d3524bf6ceed603646bdf07f319a5318be4f902fa385636e1
+  metadata.gz: 7695095d716cbc6f3b6713584bf7b78fc2323a6d9ea80abe28c0ebd8eddfa14b
+  data.tar.gz: b9efc9a38e5ea2020a2038c28bfbf6c45e2555b4804f763726750995e0c40d5c
 SHA512:
-  metadata.gz: 56493d90f7d4b17986039064c1bd6a03034aacf99b6a2ae94c5cf3cef72efe0718b146437d547ef86b51f4330153ab7b621ce072a2ec0fefc7446814aced900a
-  data.tar.gz: bed1fe93798ce23343f0178cef7d5c0b2aae9dfad1e230e8ae754b6bbc5f33b37da2e885b28ad84462a9a5c5e20731b82756b10c0d28ea68dcae1e557cacb186
+  metadata.gz: 9ccd49421abfa90e1d0dd3c8e84e6346623a4ee3eaf7aa9af8183974e0f867f520c37562d8468338179dd4425aded09f18cd169b9921744f61d368a975c7cf52
+  data.tar.gz: 6feabda3a5a2ba01042fb594e7c479545d15c48b4d41d22c0f0d0121f15d4d3e4f3c23b2e3e4f7da7f853e4746146bf91c8999e6decddb33846ef60d2a98cd0a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.33.3)
+    rsmp (0.33.4)
       async (~> 2.16)
       async-io (~> 1.43)
       colorize (~> 1.1)

data/lib/rsmp/site_proxy.rb

@@ -137,7 +137,7 @@ module RSMP
 
     def process_aggregated_status message
       se = message.attribute("se")
-      validate_aggregated_status(message,se) == false
+      validate_aggregated_status(message,se)
       c_id = message.attributes["cId"]
       component = find_component c_id
       unless component

data/lib/rsmp/supervisor_proxy.rb

@@ -172,19 +172,24 @@ module RSMP
 
     def send_aggregated_status component, options={}
       m_id = options[:m_id] || RSMP::Message.make_m_id
+
+      # For core <=3.1.2, se items must be send as strings
+      # For core > 3.1.2, se items must be send as booleans
+      if Proxy::version_meets_requirement?(core_version,"<=3.1.2")
+        se = component.aggregated_status_bools.map {|bool| bool ? "true" : "false"}
+      else
+        se = component.aggregated_status_bools
+      end
+
       message = AggregatedStatus.new({
         "aSTS" => clock.to_s,
         "cId" =>  component.c_id,
         "fP" => nil,
         "fS" => nil,
-        "se" => component.aggregated_status_bools,
+        "se" => se,
         "mId" => m_id,
       })
 
-      # Core 3.1.2 or earlier requires that se items to be send as strings
-      if Proxy::version_meets_requirement?(core_version,"<=3.1.2")
-        message.attributes["se"].map! {|bool| bool ? "true" : "false"}
-      end
 
       set_nts_message_attributes message
       send_and_optionally_collect message, options do |collect_options|
@@ -200,7 +205,7 @@ module RSMP
 
     def process_aggregated_status message
       se = message.attribute("se")
-      validate_aggregated_status(message,se) == false
+      validate_aggregated_status(message,se)
       on = set_aggregated_status se
       log "Received #{message.type} status [#{on.join(', ')}]", message: message, level: :log
       acknowledge message

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.33.3"
+  VERSION = "0.33.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.33.3
+  version: 0.33.4
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger