rsmp 0.1.33 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea326578bffa5b75bcd86c0829215d0111b3ba52c88bba7110cca3b9cc0f9fa9
-  data.tar.gz: b7d197a3430be8922429ce5ac5ce3512900d85b4b9d276d5d283f150082a3303
+  metadata.gz: df79ff6f37011ae71a4d7816981b8fe397cd681497d6bb239a9b0eef130b8a4c
+  data.tar.gz: 54e3058f699f0c3e2c8e83ef8414c76fed0f72c56c9294995e38157fa41391c5
 SHA512:
-  metadata.gz: '09ad5202d5feb194cdd9e54177f86910631ac260cd94e5afccdf1a386260de91063b438e5e6dc8675703fdaae8112036f6940793f7d3a266e84827ed38d465c1'
-  data.tar.gz: c37dcaac65b0c1a692ef95507ad25f1fa0e78bdfa089758b8511af331e2f47b1bb497cf1452442ad7f9fbf34f8860c9408eeb1674cb3084337ce4fd3b4f552eb
+  metadata.gz: 1ad1d7ae5a71231c61c7ad88d9758d7825c2ae59ea0bd0c6527f314dbe0358a5e362fd2ae55613248ae65e7505f36574833b6395d11a5cb3f989a8457ddac68f
+  data.tar.gz: 2ef823ca34736ebea62ac10fa36c735c5faf84368741ea25ad67fed0de9c8f8625628cc064491da859bd3155e1a5770aecb8e13bc493711db7949c087df30d75

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.33)
+    rsmp (0.1.38)
       async (~> 1.28.7)
       async-io (~> 1.30.2)
       colorize (~> 0.8.1)
-      rsmp_schemer (~> 0.2.0)
+      rsmp_schemer
       thor (~> 1.0.1)
 
 GEM
@@ -28,7 +28,7 @@ GEM
     builder (3.2.4)
     childprocess (3.0.0)
     colorize (0.8.1)
-    console (1.12.0)
+    console (1.13.1)
       fiber-local
     contracts (0.16.0)
     cucumber (3.1.2)
@@ -64,7 +64,7 @@ GEM
     nio4r (2.5.7)
     rake (13.0.1)
     regexp_parser (2.1.1)
-    rsmp_schemer (0.2.0)
+    rsmp_schemer (0.3.1)
       json_schemer (~> 0.2.18)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)

data/lib/rsmp/component.rb

@@ -36,7 +36,7 @@ module RSMP
         AGGREGATED_STATUS_KEYS.each_with_index do |key,index|
           @aggregated_status_bools[index] = status.include?(key)
         end
-        aggrated_status_changed options
+        aggregated_status_changed options
       end
     end
 
@@ -50,12 +50,12 @@ module RSMP
           @aggregated_status_bools[index] = on
           @aggregated_status << key if on
         end
-        aggrated_status_changed
+        aggregated_status_changed
       end
     end
 
-    def aggrated_status_changed options={}
-      @node.aggrated_status_changed self, options
+    def aggregated_status_changed options={}
+      @node.aggregated_status_changed self, options
     end
  
     def alarm code:, status:

data/lib/rsmp/components.rb

@@ -8,7 +8,7 @@ module RSMP
       @components = {}
     end
 
-    def aggrated_status_changed component, options={}
+    def aggregated_status_changed component, options={}
     end
 
     def setup_components settings

data/lib/rsmp/proxy.rb

@@ -162,6 +162,8 @@ module RSMP
           begin
             now = Clock.now
             timer(now)
+          rescue RSMP::Schemer::Error => e
+            puts "Timer: Schema error: #{e}"
           rescue EOFError => e
             log "Timer: Connection closed: #{e}", level: :warning
           rescue IOError => e
@@ -246,7 +248,7 @@ module RSMP
       # TODO
       # what schema should we use to validate the intial Version and MessageAck messages?
       schemas = { core: '3.1.5' }
-      schemas[sxl] = sxl_version if sxl
+      schemas[sxl] = RSMP::Schemer.sanitize_version(sxl_version) if sxl
       schemas
     end
 
@@ -261,7 +263,7 @@ module RSMP
       log_send message, reason
     rescue EOFError, IOError
       buffer_message message
-    rescue SchemaError => e
+    rescue SchemaError, RSMP::Schemer::Error => e
       str = "Could not send #{message.type} because schema validation failed: #{e.message}"
       log str, message: message, level: :error
       notify_error e.exception("#{str} #{message.json}")
@@ -306,7 +308,7 @@ module RSMP
       log str, message: Malformed.new(attributes), level: :warning
       # cannot send NotAcknowledged for a malformed message since we can't read it, just ignore it
       nil
-    rescue SchemaError => e
+    rescue SchemaError, RSMP::Schemer::Error => e
       str = "Received invalid #{message.type}, schema errors: #{e.message}"
       log str, message: message, level: :warning
       notify_error e.exception("#{str} #{message.json}")

data/lib/rsmp/site.rb

@@ -53,7 +53,7 @@ module RSMP
     def check_sxl_version
       sxl = @site_settings['sxl']
       version = @site_settings['sxl_version']
-      RSMP::Schemer::find_schema! sxl, version
+      RSMP::Schemer::find_schema! sxl, version, lenient: true
     end
 
     def reconnect
@@ -75,7 +75,7 @@ module RSMP
       SupervisorProxy.new settings
     end
 
-    def aggrated_status_changed component, options={}
+    def aggregated_status_changed component, options={}
       @proxies.each do |proxy|
         proxy.send_aggregated_status component, options
       end

data/lib/rsmp/site_proxy.rb

@@ -36,7 +36,8 @@ module RSMP
 
     def connection_complete
       super
-      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{@site_sxl_version}", level: :info
+       sanitized_sxl_version = RSMP::Schemer.sanitize_version(@site_sxl_version)
+      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :info
     end
 
     def process_message message
@@ -94,7 +95,7 @@ module RSMP
       if options[:collect]
         result = nil
         task = @task.async do |task|
-          wait_for_aggregated_status task, options[:collect]
+          wait_for_aggregated_status task, options[:collect], m_id
         end
         send_message message, validate: options[:validate]
         return message, task.wait
@@ -134,7 +135,7 @@ module RSMP
       acknowledge message
     end
 
-    def aggrated_status_changed component, options={}
+    def aggregated_status_changed component, options={}
       @supervisor.aggregated_status_changed self, component
     end
 
@@ -308,11 +309,13 @@ module RSMP
       # comes from the Version message send by the site
       type = 'tlc'
       version = message.attribute 'SXL'
-      RSMP::Schemer::find_schema! type, version 
+      RSMP::Schemer::find_schema! type, version, lenient: true
 
       # store sxl version requested by site
       # TODO should check agaist site settings
       @site_sxl_version = message.attribute 'SXL'
+    rescue RSMP::Schemer::UnknownSchemaError => e
+      dont_acknowledge message, "Rejected #{message.type} message,", "#{e}"
     end
 
     def sxl_version
@@ -327,8 +330,6 @@ module RSMP
       check_rsmp_version message
       check_sxl_version message
       version_accepted message
-    rescue RSMP::Schemer::UnknownSchemaError => e
-      dont_acknowledge message, "Rejected #{message.type} message,", "#{e}"
     end
 
     def check_site_ids message

data/lib/rsmp/site_proxy_wait.rb

@@ -143,7 +143,7 @@ module RSMP
       true
     end
 
-    def wait_for_aggregated_status parent_task, options={}
+    def wait_for_aggregated_status parent_task, options, m_id
       collect(parent_task,options.merge({
         type: ['AggregatedStatus','MessageNotAck'],
         num: 1

data/lib/rsmp/supervisor.rb

@@ -49,7 +49,6 @@ module RSMP
           raise RSMP::ConfigurationError.new("Configuration for site '#{site_id}' is empty")
         end
         sxl = settings['sxl']
-        sxl = 'tlc' unless sxl    # temporary fix until configs are updated
         unless sxl
           raise RSMP::ConfigurationError.new("Configuration error for site '#{site_id}': No SXL specified")
         end

data/lib/rsmp/supervisor_proxy.rb

@@ -54,7 +54,8 @@ module RSMP
 
     def connection_complete
       super
-      log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sxl_version}", level: :info
+      sanitized_sxl_version = RSMP::Schemer.sanitize_version(sxl_version)
+      log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sanitized_sxl_version}", level: :info
       start_watchdog
     end
 

data/lib/rsmp/tlc.rb

@@ -69,7 +69,7 @@ module RSMP
         group.move pos
       end
       if pos == 0
-        aggrated_status_changed
+        aggregated_status_changed
       end
     end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.33"
+  VERSION = "0.1.38"
 end

data/rsmp.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "async-io", "~> 1.30.2"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.0.1"
-  spec.add_dependency "rsmp_schemer", "~> 0.2.0"
+  spec.add_dependency "rsmp_schemer"
 
   spec.add_development_dependency "bundler", "~> 2.2.3"
   spec.add_development_dependency "rake", "~> 13.0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.38
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -70,16 +70,16 @@ dependencies:
   name: rsmp_schemer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement