rsmp 0.42.6 → 0.42.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 258499bd592ac1a1f89d61b2a1456388f2874f163e76af9f5aa79dacac17f23b
-  data.tar.gz: 9e04e8accdf3572136b0395c5fa33514c9191a2ce8241b3d13a22273ca8033c1
+  metadata.gz: f3ffec19f82ace8cc9b32f72199bcf56e9c57932186338e32769ae4d0dd45c92
+  data.tar.gz: 8365a49dc68cde741e5145c50a221a4c6fc95b17662bf267409e310aaf52e67e
 SHA512:
-  metadata.gz: 53153b249a914a0f150b622462cd273068db9762a8e4aefbd998224f073cc71e99775cf10485464339121528aa624fe4b2a33a120e2769c599cc109b58358901
-  data.tar.gz: 8d73ca04955d671b66194a23c9f6006e9a18b0c86e339d3648ddeb2e70271d3a168fe7e234bbbffe4897ae5cdf804463a902eaf62ea9999218f2e897216c79b8
+  metadata.gz: 4688a936549b44f9b1ba67ecb4c8ec53a9a544e2e106c62c479871606f29be9e09af4daafe9a6dbac4bc7b0ddacdd375ea39a2e39ec279fa01c3d4619bdbe669
+  data.tar.gz: b02bf6cdb3ff10113d84f194641793dd08bcef269e45ae61201787f09e78ebdb9acdf65139d89155b52a016da617def34e739efc5dce36c35216294638c0b54c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.42.6)
+    rsmp (0.42.8)
       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/filtering.rb

@@ -6,7 +6,6 @@ module RSMP
         return false if @settings['info'] == false && item[:level] == :info
         return false if @settings['debug'] != true && item[:level] == :debug
         return false if @settings['statistics'] != true && item[:level] == :statistics
-        return false if @settings['test'] != true && item[:level] == :test
 
         true
       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,
@@ -115,15 +115,6 @@ module RSMP
       item[:ip] && item[:port] && @muted["#{item[:ip]}:#{item[:port]}"]
     end
 
-    def level_enabled?(item)
-      return false if @settings['info'] == false && item[:level] == :info
-      return false if @settings['debug'] != true && item[:level] == :debug
-      return false if @settings['statistics'] != true && item[:level] == :statistics
-      return false if @settings['test'] != true && item[:level] == :test
-
-      true
-    end
-
     def output(level, str)
       return if str.empty? || /^\s+$/.match(str)
 

data/lib/rsmp/proxy/supervisor/modules/status.rb

@@ -138,7 +138,7 @@ module RSMP
 
         def check_status_subscription(subscription, component, code, name, now)
           current, should_send = check_on_change_update(subscription, component, code, name)
-          should_send ||= interval_update_due?(subscription, now)
+          should_send ||= interval_update_due?(subscription, now) if subscription[:interval].positive?
           return [nil, false] unless should_send
 
           subscription[:last_sent_at] = now

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = '0.42.6'.freeze
+  VERSION = '0.42.8'.freeze
 end

metadata

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