rsmp 0.19.4 → 0.19.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f188c0b34f0877ae12b9948d0784b5e1f3f2a44e52e11995ba2adf12e299f4a
-  data.tar.gz: a2b8097b5d73897840d093ce8fbf1690bd7c8bee1e1a2102a605565d12c22ddb
+  metadata.gz: ece63f3127c2afec9954b9395079a4f6bd755c1edfa1ebd86a5b656e0eb3ae7b
+  data.tar.gz: d2649a64d7905095f0c418bc3ad8dcae3e6b5c891a784e7fbdc1841f4b17e2db
 SHA512:
-  metadata.gz: '04258e76affbf8e3def87f12edaed2bde5ccf6bf36dfba175c47488082bfaa1e4e8e9c0c8c749295b098e73a39b0ca28bcb0ed4d0e0c90c054486f29a8e0d02d'
-  data.tar.gz: 516d8818dc1737648afdb7cb1496d3c96ea2e9870dc61d185d3bb5a40897ea85ecb930cfece5e5f8dbd1bf8abaf6a62244c5f6188498b082e4c896c02551b190
+  metadata.gz: 70a4b8297b24a0f7d5ffeba0b86ec26bae1d196e01d46d6b06a1cc8ab50b14705f28ecf50ca30f0d4e2487c790781e71e80e6a4c0c4d39dda08ccc98c8e1235c
+  data.tar.gz: f5f4071e92f737153bc989787626d09cd96cf24204f13e2aaf91a49383876cc6bb2ae6ee763f82a08f779806e908e7236790b98315076c652078e95670a04a11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.19.4)
+    rsmp (0.19.5)
       async (~> 1.30.3)
       async-io (~> 1.34.3)
       colorize (~> 0.8.1)

data/lib/rsmp/alarm_state.rb

@@ -35,8 +35,6 @@ module RSMP
       @category = category || 'D'
       @priority = priority || 2
       @rvs = rvs
-
-      update_timestamp unless @timestamp
     end
 
     def to_hash
@@ -101,8 +99,9 @@ module RSMP
       false
     end
 
-    def message_is_older? message
-      Time.parse(message.attribute('aTs')) < @timestamp
+    def older_message? message
+      return false if @timestamp == nil
+      RSMP::Clock.parse(message.attribute('aTs')) < @timestamp
     end
 
     # update from rsmp message
@@ -111,11 +110,11 @@ module RSMP
       unless differ_from_message? message
         raise RepeatedAlarmError.new("no changes from previous alarm #{message.m_id_short}")
       end
-      if message_is_older? message
+      if older_message? message
         raise TimestampError.new("timestamp is earlier than previous alarm #{message.m_id_short}")
       end
     ensure
-      @timestamp = message.attribute('aTs')
+      @timestamp = RSMP::Clock.parse message.attribute('aTs')
       @acknowledged = message.attribute('ack') == 'True'
       @suspended = message.attribute('sS') == 'True'
       @active = message.attribute('aS') == 'True'

data/lib/rsmp/proxy.rb

@@ -24,6 +24,11 @@ module RSMP
       @state = :disconnected
     end
 
+
+    def now
+      node.now
+    end
+
     def disconnect
     end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.19.4"
+  VERSION = "0.19.5"
 end

metadata

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