rsmp 0.5.5 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a436495b7890003c9c745d9539326867be2604dc31308042d6f9fa982d8a1595
-  data.tar.gz: '083589d05fe1fcff4ffcdd79e92ae4c34b9d8383257005ef316fb265ab5a24af'
+  metadata.gz: c4431d2545043cf60f1988e1bbb269e5727719fb6dd152c58908c5cd62b153ef
+  data.tar.gz: 4cb2c6fe95608ae4093876d2630e5a29547fdea1d6f66cdb697855e7a301470a
 SHA512:
-  metadata.gz: f443511ee9ea01faa4189f84182208362ad25f7a7d483198126b00b78de5454cd1a092ccd8348664553c31502497c4ec3f1df295d7daa7eaa53e22bd8298521b
-  data.tar.gz: 49436d1f1e79fec40b5a0a6f4482e4af29edac9b097380b0cf3359f1a35174a89234a3ea227a99767adb8931640383f5cca81e18105a9f00a44f7edaa11bc5c5
+  metadata.gz: 0dcf33801ca97d92861380ed7ee4a4cb59a343eb0744daf448afbe20fa91e2147a8a59359420cd76dd62b1cbe49026b36e284d6534d8cd71538f68ea378e06c3
+  data.tar.gz: 59e10a8475fa23b0e0d66c257ee5458acb156db1390e88ae464a73b40b63bea3be7372304bd5d331fb0dfaaf19308c731d3aaae158de5d7f16ebe67bb17ddda3

data/Gemfile.lock

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

data/config/supervisor.yaml

@@ -11,11 +11,11 @@ log:
   active: true
   color: true
   timestamp: true
-  id: true
   component: true
   ip: false
   port: true
-  site_id: true
+  site_id: 9
+  component_id: 3
   text: true
   direction: false
   level: false

data/config/tlc.yaml

@@ -33,10 +33,10 @@ log:
   active: true
   color: true
   timestamp: true
-  id: true
-  component: true
+  component_id: true
   ip: false
-  site_id: true
+  site_id: 9
+  component: 3
   level: false
   debug: true
   text: true

data/lib/rsmp/archive.rb

@@ -21,11 +21,11 @@ module RSMP
     def self.prepare_item item
       raise ArgumentError unless item.is_a? Hash
     
-      cleaned = item.select { |k,v| [:author,:level,:ip,:port,:site_id,:component_id,:str,:message,:exception].include? k }
+      cleaned = item.select { |k,v| [:author,:level,:ip,:port,:site_id,:component,:str,:message,:exception].include? k }
       cleaned[:timestamp] = Clock.now
       if item[:message]
         cleaned[:direction] = item[:message].direction 
-        cleaned[:component_id] = item[:message].attributes['cId'] 
+        cleaned[:component] = item[:message].attributes['cId']
       end
 
       cleaned

data/lib/rsmp/components.rb

@@ -15,8 +15,10 @@ module RSMP
       return unless settings
       check_main_component settings
       settings.each_pair do |type,components_by_type|
-        components_by_type.each_pair do |id,settings|
-          @components[id] = build_component(id:id, type:type, settings:settings)
+        if components_by_type
+          components_by_type.each_pair do |id,settings|
+            @components[id] = build_component(id:id, type:type, settings:settings)
+          end
         end
       end
     end

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'=>true,
+        'direction'=>false,
+        'level'=>false,
+        'id'=>true,
+        'str'=>true,
+      }
+
+      default_lengths = {
+        'index'=>7,
+        'author'=>13,
+        'timestamp'=>24,
+        'ip'=>22,
+        'port'=>5,
+        'site_id'=>19,
+        'component'=>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,45 +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).ljust(length)
-        else
-          parts << ''.ljust(length)
-        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
-
-      parts.map do |s|
-        next '-'.ljust(s.length) if s !~ /\S/  # replace the first char with a dash if string is all whitespace
-        s
-      end.join(' ').rstrip
+      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 )
+      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

data/lib/rsmp/supervisor.rb

@@ -7,6 +7,7 @@ module RSMP
     attr_reader :rsmp_versions, :site_id, :supervisor_settings, :proxies, :logger
 
     def initialize options={}
+
       handle_supervisor_settings( options[:supervisor_settings] || {} )
       super options
       @proxies = []

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.5.5"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.2
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.