rsmp 0.6.3 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4072d3e93ef2223bfc9ac2cb1a1e34b3668456e52a622a2b6f059087dd442c2e
-  data.tar.gz: 37603275646789fec0db5ec4c85baf731bebe6786693e6ad57eae7be3b3c29ed
+  metadata.gz: 75a0ca211283d5cb97be9e6f6eaf24209a68884b8e368358d0933feef870c743
+  data.tar.gz: 4ca8a761d69ae30d8dab706cbe93cdd2dc3ae7667f73d8a9c217467f2f52844a
 SHA512:
-  metadata.gz: 84a5e06ed20c8cb3331cf13ebd9bfc8d2baaf6c81ec14d67e83900d198153d86b89aeb09485f87afa9ef5c2aa7ca4469caa190a745dc9936caedc31bbb14d5a5
-  data.tar.gz: 9aa602447f391353632bf59fccd2ca48ab2eea492913cab875614c50279c362f04ebbf89559d1ea6a72878ef22e632a29160379b682356e8411568710a9d8525
+  metadata.gz: f21887cb5550e4f7b242bbd2fbc42c3d5ffaeb99eddcebf4a5af64e8766961c50f20c9fb885d6e8a7e718615b18e6731f01256162b57c437283f50e94646427b
+  data.tar.gz: 3875d442deeb61c61c75d46099967da3b7f93b7e35fbc206a7d87cc9f5474004a42b91d6dafe59f2eff5fd94f8b9d1eadbb1ae66ce63e2d4ae793ed6fc38692b

data/Gemfile.lock

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

data/README.md

@@ -125,7 +125,7 @@ This will output messages form both the site and the supervisor, ordered chronol
 ```console
 RN+SU0001                              Starting supervisor RN+SU0001 on port 12111
 RN+SI0001                              Starting site RN+SI0001
-RN+SI0001                              Connecting to superviser at 127.0.0.1:12111
+RN+SI0001                              Connecting to supervisor at 127.0.0.1:12111
 RN+SI0001                   <--  f8c7  Sent Version
 RN+SU0001                              Site connected from 127.0.0.1:53500
 RN+SU0001     RN+SI0001     -->  f8c7  Received Version message for sites [RN+SI0001] using RSMP 3.1.4
@@ -156,7 +156,7 @@ The ```site``` command will start an RSMP site, which will try to connect to one
 ```console
 % rsmp site
 2019-11-11 12:22:00 UTC                            Starting site RN+SI0001
-2019-11-11 12:22:00 UTC                            Connecting to superviser at 127.0.0.1:12111
+2019-11-11 12:22:00 UTC                            Connecting to supervisor at 127.0.0.1:12111
 2019-11-11 12:22:00 UTC                 <--  792f  Sent Version
 2019-11-11 12:22:00 UTC  RN+SU0001      -->  e70e  Received Version message, using RSMP 3.1.4
 2019-11-11 12:22:00 UTC  RN+SU0001                 Connection to supervisor established

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'=>'-',
 
@@ -24,6 +25,7 @@ module RSMP
         'ip'=>false,
         'port'=>false,
         'site_id'=>true,
+        'component'=>true,
         'direction'=>false,
         'level'=>false,
         'id'=>true,
@@ -43,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
@@ -95,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/supervisor_proxy.rb

@@ -23,15 +23,22 @@ module RSMP
     end
 
     def start
-      log "Connecting to superviser at #{@ip}:#{@port}", level: :info
+      log "Connecting to supervisor at #{@ip}:#{@port}", level: :info
       super
       connect
       @logger.unmute @ip, @port
-      log "Connected to superviser at #{@ip}:#{@port}", level: :info
+      log "Connected to supervisor at #{@ip}:#{@port}", level: :info
       start_reader
       send_version @site_settings['site_id'], @site_settings["rsmp_versions"]
-    rescue Errno::ECONNREFUSED
-      log "No connection to supervisor at #{@ip}:#{@port}", level: :error
+    rescue SystemCallError => e
+      log "Could not connect to supervisor at #{@ip}:#{@port}: Errno #{e.errno} #{e}", level: :error
+      retry_notice
+    rescue StandardError => e
+      log "Error while connecting to supervisor at #{@ip}:#{@port}: #{e}", level: :error
+      retry_notice
+    end
+
+    def retry_notice
       unless @site.site_settings['intervals']['reconnect'] == :no
         log "Will try to reconnect again every #{@site.site_settings['intervals']['reconnect']} seconds..", level: :info
         @logger.mute @ip, @port

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.3"
+  VERSION = "0.7.1"
 end

metadata

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