rsmp 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6d24a7240bcac60427bcbbe4743142db412338e847c08e35803401092dd162b
-  data.tar.gz: 264711c071e36998292d2fad4ece08bb79938ec3a7fc997016c7ca46f7f14ad1
+  metadata.gz: d4e37b5be3866a109446020e5c6eafcd6f42d459e4c4a49e740804dd8523a9f3
+  data.tar.gz: 60487c581cbf0e89d00e66398a80ba7c9fdf080d4f69d7fd9e1db5166f0190fd
 SHA512:
-  metadata.gz: a5cd2cd0d6afacb699c5c2e1da799356e33b0bfaa207ff7496221039c83143c572b2d5088a225cf9bec92036f890ad54bc099511d2344961a26742f69dec332d
-  data.tar.gz: 47d1c8569e07a5603cb8622f19f042d9bf637da0c30e08e8dd706c1b2b61efbba9d2f74f4de91e93ea969f89048dbb890ca5cc1718870708c6811a4ee6c3bd52
+  metadata.gz: 51d7732d473f79779250ea80bbb62cf0bf47cce700a69954bf162241c8ee271a27308600f6dc10c1016c644b109f27e3a9a0f5c91728cc69f096f550c3c896c9
+  data.tar.gz: fe7d9db2ced99c524673114d8f0f128821e127400474ac28e91054a83a1777e5340ab79bb48339c799ac78039482e5e06d19ea9f31ea6ff49d0dc5605556caed

data/Gemfile.lock

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

data/config/supervisor.yaml

@@ -15,9 +15,10 @@ log:
   component: true
   ip: false
   port: true
-  site_id: true
+  site_id: 9
+  component_id: 3
   text: true
-  direction: true
+  direction: false
   level: false
   debug: true
   json: true

data/config/tlc.yaml

@@ -34,13 +34,14 @@ log:
   color: true
   timestamp: true
   id: true
-  component: true
+  component_id: true
   ip: false
-  site_id: true
+  site_id: 9
+  component_id: 3
   level: false
   debug: true
   text: true
-  direction: true
+  direction: false
   json: true
   acknowledgements: false
   watchdogs: false

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/error.rb

@@ -41,6 +41,9 @@ module RSMP
 	class TimeoutError < Error
 	end
 
+	class DisonnectError < Error
+	end
+
 	class ConnectionError < Error
 	end
 

data/lib/rsmp/logger.rb

@@ -5,33 +5,60 @@ module RSMP
     
     def initialize settings={}
       defaults = {
-        'prefix'=>nil,
         'active'=>false,
         'path'=>nil,
         'stream'=>nil,
-        'author'=>false,
         'color'=>true,
-        'site_id'=>true,
-        'component'=>false,
-        'level'=>false,
-        'ip'=>false,
-        'port'=>false,
-        'index'=>false,
-        'timestamp'=>true,
-        'json'=>false,
         'debug'=>false,
         'statistics'=>false,
         'hide_ip_and_port' => false,
-        'acknowledgements' => false
+        'acknowledgements' => false,
+        'json'=>false,
+        'tabs'=>'-',
+
+        'prefix'=>false,
+        'index'=>false,
+        'author'=>false,
+        'timestamp'=>true,
+        'ip'=>false,
+        'port'=>false,
+        'site_id'=>true,
+        'component_id'=>true,
+        'direction'=>false,
+        'level'=>false,
+        'id'=>false,
+        'str'=>true,
+      }
+
+      default_lengths = {
+        'index'=>7,
+        'author'=>13,
+        'timestamp'=>24,
+        'ip'=>22,
+        'port'=>5,
+        'site_id'=>19,
+        'component_id'=>19,
+        'direction'=>4,
+        'level'=>7,
+        'id'=>4,
       }
+
       if settings
         @settings = defaults.merge settings
       else
         @settings = defaults
       end
 
-      @muted = {}
+      # copy default length for items that are set to true
+      @settings = @settings.map do |key,value|
+        if value == true && default_lengths[key]
+          [ key, default_lengths[key] ]
+        else
+          [ key, value ]
+        end
+      end.to_h
 
+      @muted = {}
       setup_output_destination
     end
 
@@ -138,43 +165,39 @@ module RSMP
       end
       log.join("\n")
     end
-  
-    def build_output item
-      parts = []
-      parts << "#{@settings['prefix']} " if @settings['prefix']
-      parts << item[:index].to_s.ljust(7) if @settings["index"] == true
-      parts << item[:author].to_s.ljust(13) if @settings["author"] == true
-      parts << Clock.to_s(item[:timestamp]).ljust(24) unless @settings["timestamp"] == false
-      parts << item[:ip].to_s.ljust(22) unless @settings["ip"] == false
-      parts << item[:port].to_s.ljust(8) unless @settings["port"] == false
-      parts << item[:site_id].to_s.ljust(13) unless @settings["site_id"] == false
-      parts << item[:component_id].to_s.ljust(18) unless @settings["component"] == false
-      
-      directions = {in:"-->",out:"<--"}
-      parts << directions[item[:direction]].to_s.ljust(4) unless @settings["direction"] == false
-
-      parts << item[:level].to_s.capitalize.ljust(7) unless @settings["level"] == false
 
+    def build_part parts, item, key, &block
+      skey = key.to_s
+      return unless @settings[skey]
       
-      unless @settings["id"] == false
-        length = 4
-        if item[:message]
-          parts << Logger.shorten_message_id(item[:message].m_id,length)+' '
-        else
-          parts << " "*(length+1)
-        end
-      end
-      parts << item[:str].to_s.strip unless @settings["text"] == false
-      parts << item[:message].json unless @settings["json"] == false || item[:message] == nil
-
-      if item[:exception]
-        parts << "#{item[:exception].class.to_s}\n"
-        parts << item[:exception].backtrace.join("\n")
-      end
-
-      out = parts.join(' ').chomp(' ')
-      out
+      part = item[key]
+      part = yield part if block
+      part = part.to_s
+      part = part.ljust @settings[skey] if @settings[skey].is_a?(Integer)
+
+      # replace the first char with a dash if string is all whitespace
+      part = @settings['tabs'].ljust(part.length) if @settings['tabs'] && part !~ /\S/
+      parts << part
     end
 
+    def build_output item
+      parts = []
+      build_part( parts, item, :prefix ) { @settings['prefix'] if @settings['prefix'] != false}
+      build_part( parts, item, :index )
+      build_part( parts, item, :author )
+      build_part( parts, item, :timestamp ) { |part| Clock.to_s part }
+      build_part( parts, item, :ip )
+      build_part( parts, item, :port )
+      build_part( parts, item, :site_id )
+      build_part( parts, item, :component_id )
+      build_part( parts, item, :direction ) { |part| {in:"-->",out:"<--"}[part] }
+      build_part( parts, item, :level ) { |part| part.capitalize }
+      build_part( parts, item, :id ) { Logger.shorten_message_id(item[:message].m_id,4) if item[:message] }
+      build_part( parts, item, :str )
+      build_part( parts, item, :json ) { item[:message].json if item[:message] }
+      build_part( parts, item, :exception ) { |e| [e.class,e.backtrace].flatten.join("\n") }
+
+      parts.join('  ').chomp(@settings['tabs']).rstrip
+    end
   end
-end
+end

data/lib/rsmp/node.rb

@@ -14,9 +14,18 @@ module RSMP
       @deferred = []
       @clock = Clock.new
       @error_queue = Async::Queue.new
+      @ignore_errors = []
+    end
+
+    def ignore_errors classes, &block
+      was, @ignore_errors = @ignore_errors, [classes].flatten
+      yield
+    ensure
+      @ignore_errors = was
     end
 
     def notify_error e, options={}
+      return if @ignore_errors.find { |klass| e.is_a? klass }
       if options[:level] == :internal
         log ["#{e.to_s} in task: #{Async::Task.current.to_s}",e.backtrace].flatten.join("\n"), level: :error
       end

data/lib/rsmp/proxy.rb

@@ -86,7 +86,7 @@ module RSMP
       return if @state == :stopped
       set_state :stopping
       stop_tasks
-      notify_error ConnectionError.new("Connection was closed")
+      notify_error DisonnectError.new("Connection was closed")
     ensure
       close_socket
       clear
@@ -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.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 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