rsmp 0.17.3 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b0fd1e980fcbbcccc0b302debbd6e128291dce874fc64f71f0ad5227bf387d9
-  data.tar.gz: 72172bb7a553ab5d411222de6fce9bb43f4e3754765bb122642c59b5b59a994b
+  metadata.gz: 617db976cf78abbb1d4bbae2e31ba58863d21f9ef9df8f912cf84eb093a6de7d
+  data.tar.gz: 056310e524601423385b17156276ff1dac127594106db24832b8368134a8c843
 SHA512:
-  metadata.gz: 3835c19f22d51abb95076f53374b4d78fd7a583a7984695a72e4ef7ea35cdf0168b4312cf1361c03cdbb5b8c9e9141a0041a792ab754adc9010b6893dd4d7afe
-  data.tar.gz: db8ac3294d90673d21b2a4e59e937452dddbb9eed3a7102981e115086ffc6c74b3ac8ff50c1267f0e4a68b31f45786bfe840b0ef155e80ccc20e8a0fade029d9
+  metadata.gz: c73d30a792e3b00c99f695ac4a686aa8b67b627b184a0abcc5c14d6f2c2495755490b581de792774e58fb524d82e30bb51a32eb6aa570be2484bba26f682437a
+  data.tar.gz: 350ae202e67dd8f51ce478321af030d578b9134bdb659510740e9ab48a9aaa549a528e1c223717af8f21044e9d5aa08fe59a8bc8f08871b2059fa72bc4bf8738

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.17.3)
+    rsmp (0.18.0)
       async (~> 1.30.3)
       async-io (~> 1.33.0)
       colorize (~> 0.8.1)
@@ -79,7 +79,7 @@ GEM
     multi_test (0.1.2)
     nio4r (2.5.9)
     rake (13.0.6)
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.0)
     rsmp_schema (0.4.0)
       json_schemer (~> 0.2.21)
       thor (~> 1.2.1)

data/lib/rsmp/alarm_state.rb

@@ -30,6 +30,13 @@ module RSMP
         'rvs' => rvs
       }
     end
+
+    def acknowledge
+      change, @acknowledged = !@acknowledged, true
+      update_timestamp if change
+      change
+    end
+
     def suspend
       change, @suspended = !@suspended, true
       update_timestamp if change

data/lib/rsmp/component.rb

@@ -13,6 +13,16 @@ module RSMP
       raise UnknownStatus.new "Status #{status_code}/#{status_name} not implemented by #{self.class}"
     end
 
+    def acknowledge_alarm alarm_code
+      alarm = get_alarm_state alarm_code
+      if alarm.acknowledge
+        log "Acknowledging alarm #{alarm_code}", level: :info
+        @node.alarm_acknowledged alarm
+      else
+        log "Alarm #{alarm_code} already acknowledged", level: :info
+      end
+    end
+
     def suspend_alarm alarm_code
       alarm = get_alarm_state alarm_code
       if alarm.suspend

data/lib/rsmp/site.rb

@@ -96,6 +96,11 @@ module RSMP
       end
     end
 
+    def alarm_acknowledged alarm_state
+      alarm = AlarmIssue.new( alarm_state.to_hash.merge('aSp' => 'Issue') )
+      send_alarm alarm
+    end
+
     def alarm_suspended_or_resumed alarm_state
       alarm = AlarmIssue.new( alarm_state.to_hash.merge('aSp' => 'Suspend') )
       send_alarm alarm

data/lib/rsmp/supervisor_proxy.rb

@@ -70,10 +70,13 @@ module RSMP
       # Async::IO::Endpoint#connect renames the current task. run in a subtask to avoid this see issue #22
       @task.async do |task|
         task.annotate 'socket task'
-        # this timeout is a workaround for #connect hanging on windows if the other side is not present yet
-        task.with_timeout 1.1 do
+        # this timeout is a workaround for connect hanging on windows if the other side is not present yet
+        timeout = @site_settings.dig('timeouts','connect') || 1.1
+        task.with_timeout timeout do
           @socket = @endpoint.connect
         end
+        delay = @site_settings.dig('intervals','after_connect')
+        task.sleep delay if delay
       end.wait
 
       @stream = Async::IO::Stream.new(@socket)
@@ -207,6 +210,16 @@ module RSMP
       end
     end
 
+    # handle incoming alarm acknowledge
+    def handle_alarm_acknowledge message
+      component_id = message.attributes["cId"]
+      component = @site.find_component component_id
+      alarm_code = message.attribute("aCId")
+      log "Received #{message.type} #{alarm_code} acknowledgement", message: message, level: :log
+      acknowledge message
+      component.acknowledge_alarm alarm_code
+    end
+
     # handle incoming alarm suspend
     def handle_alarm_suspend message
       component_id = message.attributes["cId"]

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.17.3"
+  VERSION = "0.18.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.18.0
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async