elastic-logger 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e5c23a7384acfb6540c80fe79f111d900c014b6
-  data.tar.gz: 9fcc4baf767189184765b585f2a0088293ec0942
+  metadata.gz: 3f706187e7572cff284bce76972f00b348e37ac3
+  data.tar.gz: c1f8c9b90bb6f127b39f2cc444954574021d4dc8
 SHA512:
-  metadata.gz: 33ad674a50f30e2d3e8afa558c495935ef0a399993f252c32e9a53709b57cab99a992cc27c5439fb45e6eaddedaead6a47f6a626a84f51ee0825fcc1829a248b
-  data.tar.gz: 1979f51570eab184e2e4fa78a5bda96ea631fc2770ff9881022b430fa0708763109ecfb807e2cfa8f48d97d5400404161f0ac2256968aa33d314113aa8683762
+  metadata.gz: 0cc347c8cabd2e79eeb39fc1f606bfed4f1e27bf708268a4e8ddef23052d18b89de245582a5606c2794e07fec6c552a4bd858b4a6be00bffb2dd8114ed6ebf58
+  data.tar.gz: c4dad1793d30c40f5ea0abcece658a52a7204750041f18a575b07e63b8080ae69680e7d22193bf5bfd0269dd230e43b0fa938b8f9b7b634c2e317f756882077a

data/README.md

@@ -40,19 +40,17 @@ With this file we create two logs, one which will log to elastic, and one to sta
 
 ```yml
 sidekiq_monitor:
-  writer: 'InfaktLogger::ElastickWriter'
-  rotate: 30 # how many days keep in elk
-  backup: 90 # how many days keep backup, 0 for no backup, -1 for infinite
-api_requests:
-  writer: 'InfaktLogger::DiskWriter'
+  writer: 'InfaktLogger::ElkWriter'
   delete:
     type: 'standard' # never if you want to keep that log
     unit: 'days' # One of seconds, minutes, hours, days, weeks, months, or years.
-    unit_count: # The number of unit (s). unit_count * unit will be calculated out to the relative number of seconds.
+    unit_count: 2 # The number of unit (s). unit_count * unit will be calculated out to the relative number of seconds.
   backup:
     type: 'standard' # infinite if you want to keep that log, never for no backups
     unit: 'days' # One of seconds, minutes, hours, days, weeks, months, or years.
-    unit_count: # The number of unit (s). unit_count * unit will be calculated out to the relative number of seconds.
+    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'
 ```
 ### Usage
 

data/lib/elastic-logger/configuration.rb

@@ -1,12 +1,13 @@
 module ElasticLogger
   class Configuration
-    attr_accessor :host, :types_file, :path, :prefix
+    attr_accessor :host, :types_file, :path, :prefix, :log_level
 
     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/disk_writer.rb

@@ -5,8 +5,8 @@ module ElasticLogger
       @name = name
     end
 
-    def log(hash)
-      logger.info(hash)
+    def log(severity, hash)
+      logger.send(severity, hash)
     end
 
     private

data/lib/elastic-logger/elk_writer.rb

@@ -7,17 +7,18 @@ module ElasticLogger
       @name = name
     end
 
-    def log(hash)
-      client.index(index: index, type: name, body: build_log(hash))
+    def log(severity, hash)
+      client.index(index: index, type: name, body: build_log(severity, hash))
     end
 
     private
     attr_reader :config, :name
 
-    def build_log(hash)
+    def build_log(severity, hash)
       {
         "@fields" => hash,
-        "@timestamp" => timestamp.iso8601(3)
+        "@timestamp" => timestamp.iso8601(3),
+        "@severity" => severity
       }
     end
 

data/lib/elastic-logger/logger.rb

@@ -2,16 +2,29 @@ require 'elastic-logger/types'
 
 module ElasticLogger
   class Logger
+
     def initialize(name)
       @name = name.to_s
     end
 
-    def log(hash)
-      writer.log(hash)
+    # def debug(hash)
+    # def error(hash)
+    # def fatal(hash)
+    # def info(hash)
+    # def unknown(hash)
+    # def warn(hash)
+    %w(debug error fatal info unknown warn).each do |severity|
+      define_method(severity) do |hash|
+        log(hash, severity.to_s.upcase)
+      end
+    end
+
+    def log(msg, severity = 'UNKNOWN')
+      return true if ::Logger.const_get(severity) < config.log_level
+
+      writer.log(severity, format(msg))
+      true
     end
-    alias_method :debug, :log
-    alias_method :info, :log
-    alias_method :warn, :log
 
     private
     attr_reader :name
@@ -21,6 +34,14 @@ module ElasticLogger
       Object.const_get(writer).new(name: log_name, config: config)
     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
+    end
+
     def log_name
       [config.prefix, name].map(&:to_s).reject(&:empty?).join("_")
     end

data/lib/elastic-logger/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-logger
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Radosław Woźnik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler