rsmp 0.1.36 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9146bde932fc22eeb1f696e9446d063cf98942afa46ef7a876a3ae9b5e3070a
-  data.tar.gz: 5044ef657416b04e1e6a519ded5d500d7fe6c98fcde4a1697a0e08a1540d5e3b
+  metadata.gz: a20b2e46548b2ebcdc9e3148168fafb7062113d171d88bef186900b0c8fe98a9
+  data.tar.gz: 436e96144e55742c3c9df9f549ca345c21137deb579c10d10fcefdaad1d94a39
 SHA512:
-  metadata.gz: d914ba6a4c7b2ba491999e16be4ae5d12b39ab30482952fec8b07e11ba1801f4bbc6623684c53d0d868258f60cb86b4ddc46cfd0235736d91889b0634516f9b8
-  data.tar.gz: a4d7f7fa683c31ed002d2a57c4f0a6f63f1bd99fd7703f25e72ce69d32073f1f19353476f91d7c597feb72ddcc4ff9b71e3108cf13e2bc7b9d0a1534115fcdf8
+  metadata.gz: d2e07fc806b798e15af70789085d6c5ecf582b46dfe9ff7e5ed2cd48f8e8b2d7d74eddb66ed488150dee047d1fc3886b8d84edf7dc85976db570e89544f29160
+  data.tar.gz: 8baba395982e5c105a7e04d3a0c01c91a89ae82fb21cfd180c3fe6adf436cc4b70a437206c1f499f5c5cbfe476746d7cebd1c0b38f1354a467ff4e0f80b6904d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.36)
+    rsmp (0.1.37)
       async (~> 1.28.7)
       async-io (~> 1.30.2)
       colorize (~> 0.8.1)

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_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
@@ -313,6 +314,8 @@ module RSMP
       # 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/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/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.36"
+  VERSION = "0.1.37"
 end

metadata

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