elastic-logger 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f706187e7572cff284bce76972f00b348e37ac3
-  data.tar.gz: c1f8c9b90bb6f127b39f2cc444954574021d4dc8
+  metadata.gz: 1f30dcd658a8374818b9e9cc9adf7739843470e7
+  data.tar.gz: 12aac98849fd19285474ffb710e1e1ff6a97ee9c
 SHA512:
-  metadata.gz: 0cc347c8cabd2e79eeb39fc1f606bfed4f1e27bf708268a4e8ddef23052d18b89de245582a5606c2794e07fec6c552a4bd858b4a6be00bffb2dd8114ed6ebf58
-  data.tar.gz: c4dad1793d30c40f5ea0abcece658a52a7204750041f18a575b07e63b8080ae69680e7d22193bf5bfd0269dd230e43b0fa938b8f9b7b634c2e317f756882077a
+  metadata.gz: cab4d67cd8c408a7f9a25ca59c6a5d6e7bb4b206f86ed4691a608e0a5ff85d0ce12c3c06b2579e96b11e906e0cc06dc6309b1ab784f0818e2e16e483dcb5e022
+  data.tar.gz: abeeb8ec4d25528616acf499d4e4a51086b87b50b99b7fa53348156cb02363d45d437f415b4a041c5eb853953d1cf0021d4afcf85c7a38df5e4c8d4c3af7deac

data/README.md

@@ -41,6 +41,7 @@ With this file we create two logs, one which will log to elastic, and one to sta
 ```yml
 sidekiq_monitor:
   writer: 'InfaktLogger::ElkWriter'
+  level: 'debug' # log level, one of debug, error, fatal, info, unknown, and warn
   delete:
     type: 'standard' # never if you want to keep that log
     unit: 'days' # One of seconds, minutes, hours, days, weeks, months, or years.
@@ -51,6 +52,7 @@ sidekiq_monitor:
     unit_count: 2 # The number of unit (s). unit_count * unit will be calculated out to the relative number of seconds.
 api_requests:
   writer: 'InfaktLogger::DiskWriter'
+  level: 'warn'
 ```
 ### Usage
 

data/lib/elastic-logger/configuration.rb

@@ -1,13 +1,12 @@
 module ElasticLogger
   class Configuration
-    attr_accessor :host, :types_file, :path, :prefix, :log_level
+    attr_accessor :host, :types_file, :path, :prefix
 
     def initialize
       @host = 'localhost:9200'
       @types_file = 'config/elastic_log_types.yml'
       @path = 'log'
       @prefix = ''
-      @log_level = ::Logger::DEBUG
     end
   end
 end

data/lib/elastic-logger/logger.rb

@@ -1,10 +1,12 @@
+require 'elastic-logger/message_parser'
 require 'elastic-logger/types'
 
 module ElasticLogger
   class Logger
 
-    def initialize(name)
+    def initialize(name, log_level = nil)
       @name = name.to_s
+      @log_level = log_level
     end
 
     # def debug(hash)
@@ -15,31 +17,26 @@ module ElasticLogger
     # def warn(hash)
     %w(debug error fatal info unknown warn).each do |severity|
       define_method(severity) do |hash|
-        log(hash, severity.to_s.upcase)
+        log(hash, severity)
       end
     end
 
-    def log(msg, severity = 'UNKNOWN')
-      return true if ::Logger.const_get(severity) < config.log_level
+    def log(msg, severity = 'unknown')
+      return true if skip_logging?(severity)
 
-      writer.log(severity, format(msg))
+      writer.log(format_severity(severity), format_message(msg))
       true
     end
 
     private
     attr_reader :name
 
-    def writer
-      writer = logs.fetch(name, default).fetch("writer")
-      Object.const_get(writer).new(name: log_name, config: config)
+    def skip_logging?(severity)
+      log_levels[severity] < log_levels[log_level]
     end
 
-    def format(msg)
-      case msg
-      when String then { msg: msg }
-      when Array then msg.map.with_index { |v, i| [i, v] }.to_h
-      else msg
-      end
+    def writer
+      Object.const_get(log_writer).new(name: log_name, config: config)
     end
 
     def log_name
@@ -47,15 +44,33 @@ module ElasticLogger
     end
 
     def config
-      @config ||= ElasticLogger.configuration
+      @config ||= ::ElasticLogger.configuration
+    end
+
+    def format_message(msg)
+      ::ElasticLogger::MessageParser.new.(msg)
+    end
+
+    def log_writer
+      log_type.fetch('writer')
+    end
+
+    def log_level
+      @log_level ||= log_type.fetch('level', 'info')
     end
 
-    def logs
-      @@logs ||= ElasticLogger::Types.new.all
+    def log_type
+      @log_type ||= ::ElasticLogger::Types.new.find(name)
+    end
+
+    def log_levels
+      @log_levels ||= Hash.new do |hash, key|
+        hash[key] = ::Logger.const_get(format_severity(key))
+      end
     end
 
-    def default
-      { "writer" => "ElasticLogger::NullLogger" }
+    def format_severity(severity)
+      severity.to_s.upcase
     end
   end
 end

data/lib/elastic-logger/message_parser.rb

@@ -0,0 +1,11 @@
+module ElasticLogger
+  class MessageParser
+    def call(message)
+      case message
+      when String then { msg: message }
+      when Array then message.map.with_index { |v, i| [i, v] }.to_h
+      else message
+      end
+    end
+  end
+end

data/lib/elastic-logger/templates/elastic_log_types.yml

@@ -1,5 +1,6 @@
 first_sample_log:
   writer: 'ElasticLogger::ElkWriter'
+  level: 'debug' # log level
   delete:
     type: 'standard' # never if you want to keep that log
     unit: 'days' # One of seconds, minutes, hours, days, weeks, months, or years.
@@ -10,3 +11,4 @@ first_sample_log:
     unit_count: 2 # The number of unit (s). unit_count * unit will be calculated out to the relative number of seconds.
 second_sample_log:
   writer: 'InfaktLogger::DiskWriter'
+  level: 'warn'

data/lib/elastic-logger/types.rb

@@ -8,6 +8,10 @@ module ElasticLogger
       logs.select { |_, values| values.fetch("writer") == writer }
     end
 
+    def find(name)
+      logs.fetch(name, default)
+    end
+
     private
 
     def logs
@@ -17,5 +21,9 @@ module ElasticLogger
     def config
       ElasticLogger.configuration
     end
+
+    def default
+      { "writer" => "ElasticLogger::NullLogger", "level" => "debug" }
+    end
   end
 end

data/lib/elastic-logger/version.rb

@@ -1,3 +1,3 @@
 module ElasticLogger
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-logger
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Radosław Woźnik
@@ -57,6 +57,7 @@ files:
 - lib/elastic-logger/elk_writer.rb
 - lib/elastic-logger/generator.rb
 - lib/elastic-logger/logger.rb
+- lib/elastic-logger/message_parser.rb
 - lib/elastic-logger/null_writer.rb
 - lib/elastic-logger/railtie.rb
 - lib/elastic-logger/rotate.rake