rsmp 0.6.5 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ffe9f097053c9814ad119cbd6a01192cd20c02d3ca1fffa6269dbdf534f419b
-  data.tar.gz: 9848398d419a76f16fa8eb1f527d4c6b055b17886a5ee689b7607c891103d5a1
+  metadata.gz: c9f08828abc4896fcc6a40da66ed96db50f1c7ba8d2b819ae7f7771930920bd4
+  data.tar.gz: 618100d9e2bf8ace347274a791740b094cf690be3e00e12d35f491e7a717b58e
 SHA512:
-  metadata.gz: d974b915cbc32bee428cc7f39a1e26134c6db34f72590ad9bd67400ad71ce831037a82341601369aa6582c1e4b5ecf8d4e6f8c3249a4375716bc877ca1cc7cec
-  data.tar.gz: 301eb51aecb05c57fc3395f3a06df33846e24fdd863db2ff65e81e9fc1b7c23c4e6b40e508b15a3ec0c92e87595ce78317773cfca6e13ec72ca9609d037cb1f1
+  metadata.gz: fe9ce63eae79b1145e0bce329a5c2ed723075293d1811402d65349bc368f9246bfbe4823dddb33d3dead0e74bf113937f8aac1b1c39680af81cd313637c05d71
+  data.tar.gz: e2451b14a8a9889de965a1e67b5e42e0dcfb6d28cbeb1d9bbfd962b324c8087502a93b1095edaf80fdae1c0721c38912d78d48154a8d359b2fd3846bd69063f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.6.5)
+    rsmp (0.7.3)
       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

@@ -85,7 +85,7 @@ module RSMP
           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 RepeatedAlarmError.new("timestamp is earlier than previous alarm #{previous.m_id_short}")
+          raise TimestampError.new("timestamp is earlier than previous alarm #{previous.m_id_short}")
         end
       end
     ensure

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' => ['Alarm'],
+        'aggregated_status' => ['AggregatedStatus','AggregatedStatusRequest']
+      }
+
       if settings
         @settings = defaults.merge settings
       else
@@ -95,11 +105,14 @@ 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"
+        ack = (type == "MessageAck" || type == "MessageNotAck")
+        @ignorable.each_pair do |key,types|
+          ignore = [types].flatten
+          if @settings[key] == false
+            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/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.5"
+  VERSION = "0.7.3"
 end

metadata

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