rsmp 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6d24a7240bcac60427bcbbe4743142db412338e847c08e35803401092dd162b
-  data.tar.gz: 264711c071e36998292d2fad4ece08bb79938ec3a7fc997016c7ca46f7f14ad1
+  metadata.gz: 7d5f4cf2cac16a579cca8eb8e81d84ff60cd94e294bba6caf3c3d450fc71e202
+  data.tar.gz: c99aade3e55837ee0502e0b3b3e8120ad5f488fcc78b5cdc7d412534012fa72d
 SHA512:
-  metadata.gz: a5cd2cd0d6afacb699c5c2e1da799356e33b0bfaa207ff7496221039c83143c572b2d5088a225cf9bec92036f890ad54bc099511d2344961a26742f69dec332d
-  data.tar.gz: 47d1c8569e07a5603cb8622f19f042d9bf637da0c30e08e8dd706c1b2b61efbba9d2f74f4de91e93ea969f89048dbb890ca5cc1718870708c6811a4ee6c3bd52
+  metadata.gz: 37ce6e272ccb1265865000d35fb5fb473f426c725786a89b8f7cf52871f40dc82a5f90fb860c7aa5a9662fc1c2554cef31a68e15583d949e19c6732ae4b47289
+  data.tar.gz: 738d271c31fe5d968c9a24e983ce66758891b46cc3c83bcdce374c20603dd54b68ce47a0d0686b3967b4ffcc45c4830c14535464f8094cdab9d483687d3355c0

data/Gemfile.lock

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

data/lib/rsmp/collect/collector.rb

@@ -61,9 +61,18 @@ module RSMP
       str = "#{@title.capitalize} collection"
       str << " in response to #{options[:m_id]}" if options[:m_id]
       str << " didn't complete within #{@options[:timeout]}s"
+      reached = progress
+      str << ", reached #{progress[:reached]}/#{progress[:need]}"
       raise RSMP::TimeoutError.new str
     end
 
+    # Return progress as collected vs. number requested
+    def progress
+      need = @options[:num]
+      reached =  @messages.size
+      { need: need, got: reached }
+    end
+
     # Get the collected message.
     def message
       @messages.first

data/lib/rsmp/collect/matcher.rb

@@ -70,6 +70,13 @@ module RSMP
       @queries.map { |query| query.message }.uniq
     end
 
+    # Return progress as completes queries vs. total number of queries
+    def progress
+      need = @queries.size
+      reached =  @queries.count { |query| query.done? }
+      { need: need, reached: reached }
+    end
+
     # Are there queries left to match?
     def done?
       @queries.all? { |query| query.done? }

data/lib/rsmp/collect/notifier.rb

@@ -26,6 +26,7 @@ module RSMP
       dequeue_notify
     ensure
       @defer_notify = was
+      @notify_queue = []
     end
 
     def dequeue_notify

data/lib/rsmp/proxy.rb

@@ -350,7 +350,7 @@ module RSMP
     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}"), message: message
+      notify_error e.exception(str), message: message
       dont_acknowledge message, str
       message
     rescue InvalidMessage => e
@@ -360,12 +360,11 @@ module RSMP
       message
     rescue FatalError => e
       str = "Rejected #{message.type},"
-      notify_error e.exception("#{str} #{message.json}"), message: message
+      notify_error e.exception(str), message: message
       dont_acknowledge message, str, "#{e.message}"
       stop
       message
     ensure
-      clear_deferred_notify
       node.clear_deferred
     end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async