rsmp 0.6.4 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b8c859b9c8450af6a45d52a9d42d982c5becdaf1d4424f398b417bc1c387d8
-  data.tar.gz: 7f194bb392a69555f7ba30364466dfed9eeb1b04996505fa13af13d9045bb071
+  metadata.gz: 1a5a515a9a42c794ebc27efd12ab9d87a1b0281544e06050bfe63f433bdf4a80
+  data.tar.gz: 51e2cca7f3e44cf5c4fe6447151436474f1d5001715e8a4ce54c070ce867565e
 SHA512:
-  metadata.gz: 2d9da45e5f1a96756cd50f58ea3ce16dc0de51138daa45aa114f432e0531595883c5cf3dba86ad63dd0a33aed7ba02d706f058378c257129a8b877eb45e2246b
-  data.tar.gz: 59965992a0e7bcdd6e401fac5baa2e8839c392713812da579865020d6cf5d9cf73d51b250f9be72cab3264fd5a9edd287e85619e2ebab0259fb303da9cfe25ff
+  metadata.gz: ac5c99fb01e74f49a7bab931fefe9314c1d4279e7c0be9d688de622c60892edb0138ac72b676261fc6e86681e01e30f7b59d28ee33e853389af509b9229f5982
+  data.tar.gz: 8050ccd64dc78c49704f403fea069ab62c6f68778a3b3f2fdabba359d74620027959f8ab2bc5ce0fc22193a403301d7454a186fe01f14fd54800534ac640e541

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.6.4)
+    rsmp (0.7.2)
       async (~> 1.29.1)
       async-io (~> 1.32.1)
       colorize (~> 0.8.1)

data/config/supervisor.yaml

@@ -15,5 +15,3 @@ log:
   level: false
   debug: true
   json: true
-  acknowledgements: false
-  watchdogs: false

data/config/tlc.yaml

@@ -48,5 +48,3 @@ log:
   level: false
   debug: true
   json: true
-  acknowledgements: false
-  watchdogs: false

data/lib/rsmp/component.rb

@@ -79,16 +79,17 @@ module RSMP
 
     def handle_alarm message
       code = message.attribute('aCId')
-      alarm = @alarms[code]
-      if alarm
-        if alarm.differ? message
-          @alarms[code] = alarm
-        else
-          raise RepeatedAlarmError.new("no changes from previous alarm #{alarm.m_id_short}")
+      previous = @alarms[code]
+      if previous
+        unless message.differ?(previous)
+          raise RepeatedAlarmError.new("no changes from previous alarm #{previous.m_id_short}")
+        end
+        if Time.parse(message.attribute('aTs')) < Time.parse(previous.attribute('aTs'))
+          raise TimestampError.new("timestamp is earlier than previous alarm #{previous.m_id_short}")
         end
-      else
-        @alarms[code] = message
       end
+    ensure
+      @alarms[code] = message
     end
 
     # Handle an incoming status respone, by storing the values

data/lib/rsmp/error.rb

@@ -64,4 +64,7 @@ module RSMP
 
 	class RepeatedStatusError < Error
 	end
+
+	class TimestampError < Error
+	end
 end

data/lib/rsmp/logger.rb

@@ -14,6 +14,7 @@ module RSMP
         'hide_ip_and_port' => false,
         'acknowledgements' => false,
         'watchdogs' => false,
+        'alarms' => true,
         'json'=>false,
         'tabs'=>'-',
 
@@ -44,6 +45,15 @@ module RSMP
         'id'=>4,
       }
 
+      @ignorable = {
+        'versions' => ['Version'],
+        'statuses' => ['StatusRequest','StatusSubscribe','StatusUnsubscribe','StatusResponse','StatusUpdate'],
+        'commands' => ['CommandRequest','CommandResponse'],
+        'watchdogs' => 'Watchdog',
+        'alarms' => ['AlarmIssue','AlarmRequest','AlarmAcknowledged','AlarmSuspend','AlarmResume'],
+        'aggregated_status' => ['AggregatedStatus','AggregatedStatusRequest']
+      }
+
       if settings
         @settings = defaults.merge settings
       else
@@ -96,10 +106,15 @@ module RSMP
       if item[:message]
         type = item[:message].type
         ack = type == "MessageAck" || type == "MessageNotAck"
-        if @settings["watchdogs"] == false
-          return false if type == "Watchdog"
-          if ack
-            return false if item[:message].original && item[:message].original.type == "Watchdog"
+        @ignorable.each_pair do |key,types|
+          next unless types
+          ignore = [types].flatten
+          if @settings[key] == false
+            #p [type,ignore_type, [ignore_type].flatten.include?(type)]
+            return false if ignore.include?(type)
+            if ack
+              return false if item[:message].original && ignore.include?(item[:message].original.type)
+            end
           end
         end
         return false if ack && @settings["acknowledgements"] == false && 

data/lib/rsmp/message.rb

@@ -126,7 +126,7 @@ module RSMP
     end
 
     def initialize attributes = {}
-      @timestamp = Time.now   # this timestamp is for internal use, and does not the clock
+      @timestamp = Time.now   # this timestamp is for internal use, and does not use the clock
                               # in the node, which can be set by an rsmp supervisor
 
       @attributes = { "mType"=> "rSMsg" }.merge attributes

data/lib/rsmp/site_proxy.rb

@@ -68,7 +68,7 @@ module RSMP
         else
           super message
       end
-    rescue RSMP::RepeatedAlarmError, RSMP::RepeatedStatusError => e
+    rescue RSMP::RepeatedAlarmError, RSMP::RepeatedStatusError, TimestampError => e
       str = "Rejected #{message.type} message,"
       dont_acknowledge message, str, "#{e}"
       notify_error e.exception("#{str}#{e.message} #{message.json}")

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -19,7 +19,12 @@ module RSMP
         @signal_plans = {}
         return unless signal_plans
         signal_plans.each_pair do |id,settings|
-          @signal_plans[id.to_i] = SignalPlan.new(nr: id.to_i, states:settings['states'],dynamic_bands:settings['dynamic_bands'])
+          states = nil
+          bands = nil
+          states = settings['states'] if settings
+          dynamic_bands = settings['dynamic_bands'] if settings
+
+          @signal_plans[id.to_i] = SignalPlan.new(nr: id.to_i, states:states,dynamic_bands:dynamic_bands)
         end
       end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.6.4"
+  VERSION = "0.7.2"
 end

metadata

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