rsmp 0.5.4 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d5f4cf2cac16a579cca8eb8e81d84ff60cd94e294bba6caf3c3d450fc71e202
-  data.tar.gz: c99aade3e55837ee0502e0b3b3e8120ad5f488fcc78b5cdc7d412534012fa72d
+  metadata.gz: 99c851e6110d58148d2e4875f65340d6427a3a674908ae95397025bc380491bc
+  data.tar.gz: 9aa3d5570819e3b20e84542ee3b6ef6bb5d8a17afae964394f14f7e6eda88e2d
 SHA512:
-  metadata.gz: 37ce6e272ccb1265865000d35fb5fb473f426c725786a89b8f7cf52871f40dc82a5f90fb860c7aa5a9662fc1c2554cef31a68e15583d949e19c6732ae4b47289
-  data.tar.gz: 738d271c31fe5d968c9a24e983ce66758891b46cc3c83bcdce374c20603dd54b68ce47a0d0686b3967b4ffcc45c4830c14535464f8094cdab9d483687d3355c0
+  metadata.gz: c54182fe42fd77bc9f23b7a7ea116807d92e8c9c02a62ae91da1460373ec695f390f98ebe6d6dcb8e2c72487f861f0ab12bd947e1271942b7a0fba2916b7dbff
+  data.tar.gz: 5510c69befdc20d5091c16709c5d9b70a7a226773aad37b69fe1699c8cc86443b1196c8d348e0996ec5da8b8a94b1b3b3f2db8c0bcbedaa2ac979797d5b2e535

data/Gemfile.lock

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

data/config/supervisor.yaml

@@ -11,13 +11,13 @@ 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: true
+  direction: false
   level: false
   debug: true
   json: true

data/config/tlc.yaml

@@ -33,14 +33,14 @@ 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
-  direction: true
+  direction: false
   json: true
   acknowledgements: false
   watchdogs: false

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,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

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.4"
+  VERSION = "0.6.1"
 end

metadata

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