rsmp 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a436495b7890003c9c745d9539326867be2604dc31308042d6f9fa982d8a1595
-  data.tar.gz: '083589d05fe1fcff4ffcdd79e92ae4c34b9d8383257005ef316fb265ab5a24af'
+  metadata.gz: 22ab99646f7155eb2bd6cd2f39923f499f7fa5b019f63a5124886bc1ef4cbb15
+  data.tar.gz: db75cb477bfe945f799f37108a33550b4251d05b3d1a4f225e962dad16a4c827
 SHA512:
-  metadata.gz: f443511ee9ea01faa4189f84182208362ad25f7a7d483198126b00b78de5454cd1a092ccd8348664553c31502497c4ec3f1df295d7daa7eaa53e22bd8298521b
-  data.tar.gz: 49436d1f1e79fec40b5a0a6f4482e4af29edac9b097380b0cf3359f1a35174a89234a3ea227a99767adb8931640383f5cca81e18105a9f00a44f7edaa11bc5c5
+  metadata.gz: c311032b06dab4f4d0aeb3a1ce61c961b87125546116eba2429bce01f3cdb5bcd0a9bf0bbe037dedb6c0cea2e269926cc180be51823bcddddebe89bde55c273f
+  data.tar.gz: 3121265aa3f49f49131a4afe7fe2479bcad25b2be74bcfaabb89ef8cf485cbae20298a33df456913c5818f160d0fa1e5ce7adf8142cbdac962cd109e8b13fd66

data/Gemfile.lock

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

data/config/supervisor.yaml

@@ -15,7 +15,8 @@ log:
   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

@@ -34,9 +34,10 @@ 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

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,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_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/version.rb

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

metadata

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