rsmp 0.42.7 → 0.42.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e7007ddcd35fce7e690769818edd860daf4afe7b77b5ff4ea58681b194366c2
-  data.tar.gz: ecc07228515add12685e64c32e5b062755109c7b6fd1dd0f88a0de84c03f7cfe
+  metadata.gz: 14695207a9d722b94988550ab5a9d2e5c3dfb31cab1073601c9dce66a6b15b08
+  data.tar.gz: 9d3721e8c5155a3156c678142f09bc2f343d336b55bd8906343b4d6feb785084
 SHA512:
-  metadata.gz: b3ee46ca3d42364edd3652209783188e18d34131d826ff18fb5eaac97fec6013ff4b9ff980a83416f338878537ecf80a0544bab9acabeca39564270e1e835217
-  data.tar.gz: a52efaf98b49efcc3f038b8929c3154625980db859dd56e6d8be6129e9ae882d1f547a614016fb686bdde26f0d3b8b4e5dc281bf50a11dd7116b297878c33d30
+  metadata.gz: 4c0b0ba9f632cc0c567e4a989510cde9f9cf3e4c968d7112c147dc98e87862c83bf49dc8f6b4994b6c9386e26d9a486718bf223c1dd1fa8883643d824191dd79
+  data.tar.gz: 6026dc8779960ad5bbf4006bc813dad26b0d98e4abca735f51cc8563097874014d3dc5a928949198c9b6c315ca7fd51c44585fbaee6b78b520ca27f4b47bd05f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.42.7)
+    rsmp (0.42.9)
       async (~> 2.32)
       colorize (~> 1.1)
       io-endpoint (~> 0.15)

data/config/supervisor.yaml

@@ -7,11 +7,3 @@ default:
   timeouts:
     watchdog: 0.2
     acknowledgement: 0.2
-log:
-  port: true
-  site_id: 9
-  component: 2
-  direction: false
-  level: false
-  debug: true
-  json: true

data/lib/rsmp/log/colorization.rb

@@ -4,36 +4,47 @@ module RSMP
     module Colorization
       def default_colors
         {
-          'info' => 'white',
-          'log' => 'light_blue',
-          'statistics' => 'light_black',
-          'warning' => 'light_yellow',
-          'error' => 'red',
-          'debug' => 'light_black',
-          'collect' => 'light_black'
+          'error' => { 'color' => 'red' },
+          'warning' => { 'color' => 'yellow' },
+          'info' => { 'color' => 'white' },
+          'log' => { 'color' => 'white', 'mode' => 'dim' },
+          'statistics' => { 'color' => 'grey', 'mode' => 'dim' },
+          'debug' => { 'color' => 'grey', 'mode' => 'dim' },
+          'collect' => { 'color' => 'grey', 'mode' => 'dim' }
         }
       end
 
       def colorize_with_map(level, str, colors)
         color = colors[level.to_s]
-        color ? str.colorize(color.to_sym) : str
+        return str unless color
+
+        if color.is_a?(Hash)
+          opts = {}
+          opts[:color] = color['color'].to_sym if color['color']
+          opts[:mode] = color['mode'].to_sym if color['mode']
+          str.colorize(opts)
+        else
+          str.colorize(color.to_sym)
+        end
       end
 
       def apply_hash_colors(level, str)
         colors = default_colors
-        colors.merge! @settings['color'] if @settings['color'].is_a?(Hash)
+        style = @settings['style']
+        colors.merge!(style) if style.is_a?(Hash)
         colorize_with_map(level, str, colors)
       end
 
       def colorize(level, str)
-        return str if @settings['color'] == false || @settings['color'].nil?
+        style = @settings['style']
+        return str if style == false || style.nil?
 
-        if @settings['color'] == true || @settings['color'].is_a?(Hash)
+        if style == true || style.is_a?(Hash)
           apply_hash_colors(level, str)
         elsif %i[nack warning error].include?(level)
-          str.colorize(@settings['color']).bold
+          str.colorize(style).bold
         else
-          str.colorize @settings['color']
+          str.colorize style
         end
       end
     end

data/lib/rsmp/log/logger.rb

@@ -11,7 +11,7 @@ module RSMP
         'active' => true,
         'path' => nil,
         'stream' => nil,
-        'color' => true,
+        'style' => true,
         'debug' => false,
         'statistics' => false,
         'hide_ip_and_port' => false,

data/lib/rsmp/proxy/modules/tasks.rb

@@ -24,7 +24,7 @@ module RSMP
         rescue EOFError, Async::Stop
           log 'Connection closed', level: :warning
         rescue IOError => e
-          log "IOError: #{e}", level: :warning
+          log "IOError: #{e}", level: :debug
         rescue Errno::ECONNRESET
           log 'Connection reset by peer', level: :warning
         rescue Errno::EPIPE

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = '0.42.7'.freeze
+  VERSION = '0.42.9'.freeze
 end

metadata

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