kybus-logger 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39fcb6ac69876e64bdf175f357c8602b3b24ddff49c6d31cc4158409641ccf93
-  data.tar.gz: 562466fb26205e9a85646b94554a8b04e82607a22767eceb180513c346c0e3f0
+  metadata.gz: 3701342a891450befe67513434dbd187c2300563939717971ccf9f5cd8db7477
+  data.tar.gz: db83a143f6ea69bbbe49c193b841bf6ec4654a4eab2466883f1d1a8fe0a20558
 SHA512:
-  metadata.gz: 9c6f800d57771c31f8a931f5501886c599cef32b05cb450d46771a8b47cada9050ae548d44e4c664a3a449eb3c0980cd8ada24f336799f1432ff1f684d74bccf
-  data.tar.gz: e7514e3f9d425a41cd633a86e41c4ae51f6ccd274c43b031decdac894d5deb07966a9022ac1789bf4e39cf78ec33d5c3199bf8af0e928ba6f2e6092b494066dd
+  metadata.gz: 1516fb68602f9f241f0a1d8513b0aacb76c7c185793fe8996e158c8f0b220cf84a7bc847496d5b68975c6b72b1eb0929a6a2c4f43eddda93618f2eceecab5426
+  data.tar.gz: 8f512efdcb640b18701f66d7e0fcb08f2d5b7038e64a20b29cf7d8f90b852554c986ed3030235daaff95e10c253f56a518b11bc18adf628e19daf23c44e5c79c

data/lib/kybus/logger/config.rb

@@ -21,15 +21,18 @@ module Kybus
         new(config)
       end
 
+      def init_log_file
+        register('file', @original_config['stdout'] ? $stdout : @original_config['file'] || 'application.log')
+        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

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.2.3'
   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.2.3
 platform: ruby
 authors:
 - Gilberto Vargas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2022-11-17 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.3.7
 signing_key: 
 specification_version: 4
 summary: Implements a kybus-logger with a format based on cute_logger