kybus-logger 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39fcb6ac69876e64bdf175f357c8602b3b24ddff49c6d31cc4158409641ccf93
-  data.tar.gz: 562466fb26205e9a85646b94554a8b04e82607a22767eceb180513c346c0e3f0
+  metadata.gz: 7e8425c5c0e962f2a2e4a9d60d8e36c545d16c94c93f4c7a35059f13f6644b1a
+  data.tar.gz: 5a9cd41cb837ae50d22d08bb409cb77844ab8a105503b5203c96c1f56e1dce35
 SHA512:
-  metadata.gz: 9c6f800d57771c31f8a931f5501886c599cef32b05cb450d46771a8b47cada9050ae548d44e4c664a3a449eb3c0980cd8ada24f336799f1432ff1f684d74bccf
-  data.tar.gz: e7514e3f9d425a41cd633a86e41c4ae51f6ccd274c43b031decdac894d5deb07966a9022ac1789bf4e39cf78ec33d5c3199bf8af0e928ba6f2e6092b494066dd
+  metadata.gz: c80780a263df96fe7edb480a25bcf1ea78c16b9f00087184a0483c00c2125d73be8f3d69ebfa06577718a3d2472e7ba48be32deca856066c3fd009e11a64e5ed
+  data.tar.gz: ec534f16743c6cdfeae02261d2e99a4b8f68e0edf8568e85401115dee54e7a4135b624f908dc91613ab58a8c909ac028cee52388905c17ec7ad0ce38c6d1d251

data/lib/kybus/logger/config.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'logger'
-
 require_relative 'format'
 
 module Kybus
@@ -21,26 +20,39 @@ module Kybus
         new(config)
       end
 
+      def init_log_file
+        log_output = if @original_config['stdout'].nil? || @original_config['stdout']
+                       $stdout
+                     else
+                       @original_config['file'] || 'application.log'
+                     end
+        register('file', log_output)
+        register('rotate_days', @original_config['rotate_days'] || 7)
+        register('rotate_size', @original_config['rotate_size'] || (100 * (1024**2))) # 100Mb
+      end
+
       def initialize(config)
         @original_config = config
-        register('file', config['stdout'] ? STDOUT : config['file'] || 'application.log')
-        register('rotate_days', config['rotate_days'] || 7)
-        register('rotate_size', config['rotate_size'] || 100 * 1024**2) # 100Mb
+        init_log_file
         register('date_format', config['date_format'] || '%Y-%m-%d %H:%M:%S')
         register('severity', config['severity'] || 'info')
-        register('log_format', config['log_format'] ||
-                 "%time,%sev,%pid,%tid,%mod,%json\n")
+        register('log_format', config['log_format'] || "%time,%sev,%pid,%tid,%mod,%json\n")
         register('blacklist', config['blacklist'] || %w[pass password])
         register('logger', logger)
       end
 
       def logger
         @logger ||= begin
-          logger = ::Logger.new(
-            resource('file'),
-            resource('rotate_days'),
-            resource('rotate_size')
-          )
+          log_output = resource('file')
+          logger = if log_output == $stdout
+                     ::Logger.new(log_output)
+                   else
+                     ::Logger.new(
+                       log_output,
+                       resource('rotate_days'),
+                       resource('rotate_size')
+                     )
+                   end
           $stdout.sync = true if @original_config['stdout']
           logger.sev_threshold = SEVERITIES[resource('severity')]
           logger.datetime_format = resource('date_format')

data/lib/kybus/logger/format.rb

@@ -13,21 +13,33 @@ module Kybus
       # - %json: Data object encoded as json
       # default format:
       #   "%time,%sev,%pid,%tid,%module,%json"
-      def format_builder(format_string)
-        proc do |frmt, sev, time, mod, data|
-          meta = {
+      class LogCreator
+        attr_reader :frmt
+
+        def initialize(frmt, sev, time, mod)
+          @frmt = frmt
+          @meta = {
             '%sev': sev,
             '%time': time,
             '%mod': mod,
             '%pid': Process.pid.to_s(16),
             '%tid': Thread.current.object_id.to_s(16)
           }
+        end
+
+        def log_data(data)
           entry = frmt.dup
-          meta.each { |k, v| entry.gsub!(k.to_s, v.to_s) }
+          @meta.each { |k, v| entry.gsub!(k.to_s, v.to_s) }
           # json is slower than the meta records, so it is better to replace
           # in a lazy way.
-          # TODO: Move lazy tags to a pluggin-based model.
+          # TODO: Move lazy tags to a plugin-based model.
           entry.gsub('%json', data.to_json) if frmt.include?('%json')
+        end
+      end
+
+      def format_builder(format_string)
+        proc do |frmt, sev, time, mod, data|
+          LogCreator.new(frmt, sev, time, mod).log_data(data)
         end.curry.call(format_string)
       end
     end

data/lib/kybus/logger/log_methods.rb

@@ -13,37 +13,34 @@ module Kybus
         LogMethods.register(:global_config, config)
       end
 
-      def log_info(msg, data = {})
-        log_raw(:info, msg, data, data[:debug])
-      end
-
-      def log_warn(msg, data = {})
-        log_raw(:warn, msg, data, data[:debug])
-      end
-
-      def log_error(msg, data = {})
-        log_raw(:error, msg, data, data[:debug])
-      end
-
-      def log_fatal(msg, data = {})
-        log_raw(:fatal, msg, data, data[:debug])
-      end
-
-      def log_debug(msg, data = {})
-        log_raw(:debug, msg, data, data[:debug])
+      %i[debug info warn error fatal].each do |level|
+        define_method("log_#{level}".to_s) do |msg, data = nil|
+          debug = {}
+          case data
+          when Hash
+            debug = data.delete(:debug)
+          when NilClass
+            data = {}
+          when String
+            data = [data]
+          when Exception
+            data = { message: data.message, class: data.class, stack: data.backtrace }
+          end
+          log_raw(level, msg, data, debug)
+        end
       end
 
       def log_metric(metric:, amount:, group: nil, time: nil)
-        log_info('Metric', metric: metric, value: amount,
-                           group: group, time: time)
+        log_info('Metric', metric:, value: amount,
+                           group:, time:)
       end
 
       def log_alert(description:, group:, alert_severity:, notify_group:)
         log_fatal('Alert Triggered',
-                  description: description,
-                  group: group,
+                  description:,
+                  group:,
                   severity: alert_severity,
-                  notify_group: notify_group)
+                  notify_group:)
       end
 
       def log_raw(severity, msg, data, debug = {})

data/lib/kybus/logger/version.rb

@@ -2,6 +2,6 @@
 
 module Kybus
   module Logger
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kybus-logger
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Gilberto Vargas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kybus-core
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,8 @@ files:
 homepage: https://github.com/tachomex/kybus
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.5.14
 signing_key: 
 specification_version: 4
 summary: Implements a kybus-logger with a format based on cute_logger