influxdb-logger 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd80eaf9eda418f4e29e848e43c8fdc27af5313d
-  data.tar.gz: aea9e2e75e2cf55dad07ed6c7416c78f0eec351b
+  metadata.gz: 8b05d8b6706111f2fca5db10879f26ce106aa81b
+  data.tar.gz: f486822bc9d4c99f7837c8dfc6d0ee760c240e48
 SHA512:
-  metadata.gz: ebdebe6c27c0cd8c7165fdf71e42f5fc416aa6573d85129ee2ed72734ed9eba0fd7e09cb8f368912859524b009d5251ae3470a102d9e239bfa7110d06c3b82c4
-  data.tar.gz: b9014899996b8f54788062748c91f1171ab290a63b674c222f67b87a344c1755c4f6be31bef47e406e08c7c7d2d53bb3a7e1207d79c3ae78b6952beedda45edb
+  metadata.gz: e438029412859abae4811a40d1982ff86f24f8faa762f37f4f653666109dbeea1130635146a5a6df6254870267345ffe862d04255f7616464efd36ae0463abf4
+  data.tar.gz: a46e990537873512fa206aa0de0de1eff7121fc0db29b2f86c189784e9fe0fc3038fb9b7e5f1a2508aa15c8c6152d24e5d69e938440b61434cd8b341e2b85630

data/lib/influxdb-logger/logger.rb

@@ -33,22 +33,22 @@ class Time
   end
 end
 
-module InfluxdbLogger
-  def log_to_file(message) # for test
-    open("#{Rails.root}/log/my.log", 'a') { |f|
-      f.puts message.inspect
-    }
-  end
+def log_to_file(message) # for test
+  open("#{Rails.root}/log/my.log", 'a') { |f|
+    f.puts message.inspect
+  }
+end
 
+module InfluxdbLogger
   module Logger
-
     # Severity label for logging. (max 5 char)
     SEV_LABEL = %w(DEBUG INFO WARN ERROR FATAL ANY)
 
-    def self.new(async: true, log_tags: {}, settings: {}, batch_size: 1000, interval: 1000)
-      Rails.application.config.log_tags = log_tags.values
+    def self.new(async: true, tags: {}, fields: {}, settings: {}, batch_size: 1000, interval: 1000)
+      all_tags = tags.values + fields.values
+      Rails.application.config.log_tags = all_tags
       if Rails.application.config.respond_to?(:action_cable)
-        Rails.application.config.action_cable.log_tags = log_tags.values.map do |x|
+        Rails.application.config.action_cable.log_tags = all_tags.map do |x|
           case
             when x.respond_to?(:call)
               x
@@ -69,7 +69,7 @@ module InfluxdbLogger
       settings[:async] = async
 
       level = SEV_LABEL.index(Rails.application.config.log_level.to_s.upcase)
-      logger = InfluxdbLogger::InnerLogger.new(settings, level, log_tags)
+      logger = InfluxdbLogger::InnerLogger.new(settings, level, tags, fields)
       logger = ActiveSupport::TaggedLogging.new(logger)
       logger.extend self
     end
@@ -100,7 +100,7 @@ module InfluxdbLogger
   end
 
   class InnerLogger < ActiveSupport::Logger
-    def initialize(options, level, log_tags)
+    def initialize(options, level, tags, fields)
       self.level = level
       @messages_type = (options[:messages_type] || :array).to_sym
       @tag = options[:tag]
@@ -122,7 +122,8 @@ module InfluxdbLogger
 
       @severity = 0
       @messages = []
-      @log_tags = log_tags
+      @all_tags = tags.merge(fields)
+      @fields = fields
       after_initialize if respond_to? :after_initialize
     end
 
@@ -183,7 +184,7 @@ module InfluxdbLogger
       tags = @global_tags.clone
 
       if @tags
-        @log_tags.keys.zip(@tags).each do |k, v|
+        @all_tags.keys.zip(@tags).each do |k, v|
           tags[k] = v
         end
       end
@@ -191,8 +192,8 @@ module InfluxdbLogger
       message = {
         series: @series,
         timestamp: Time.now.to_precision(@time_precision),
-        tags: tags,
-        values: values.merge({
+        tags: tags.except(@fields.keys),
+        values: values.merge(tags.slice(@fields.keys)).merge({
           severity: format_severity(@severity)
         }).transform_values {|value|
           case value

data/lib/influxdb-logger/version.rb

@@ -1,3 +1,3 @@
 module InfluxdbLogger
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/logger_spec.rb

@@ -51,7 +51,7 @@ describe InfluxdbLogger::Logger do
 
   let(:series) { 'Request' }
 
-  let(:log_tags) {
+  let(:tags) {
     {
       uuid: :uuid,
       foo: ->(request) { 'foo_value' }
@@ -71,7 +71,7 @@ describe InfluxdbLogger::Logger do
   }
 
   let(:logger) {
-    InfluxdbLogger::Logger.new(log_tags: log_tags, settings: settings)
+    InfluxdbLogger::Logger.new(tags: tags, settings: settings)
   }
 
   let(:request) {
@@ -81,9 +81,9 @@ describe InfluxdbLogger::Logger do
   describe 'logging' do
 
     describe 'basic' do
-      it 'info' do
+      it 'info', now: true do
         # see Rails::Rack::compute_tags
-        tags = log_tags.values.collect do |tag|
+        tag_values = tags.values.collect do |tag|
           case tag
           when Proc
             tag.call(request)
@@ -94,7 +94,7 @@ describe InfluxdbLogger::Logger do
           end
         end
         logger[:abc] = 'xyz'
-        logger.tagged(tags) { logger.info('hello') }
+        logger.tagged(tag_values) { logger.info('hello') }
         expect(@my_logger.log).to eq(
                                     [{
                                       series: series,
@@ -111,7 +111,7 @@ describe InfluxdbLogger::Logger do
                                       }
                                     }])
         @my_logger.clear
-        logger.tagged(tags) { logger.info('world'); logger.info('bye') }
+        logger.tagged(tag_values) { logger.info('world'); logger.info('bye') }
         expect(@my_logger.log).to eq(
           [{
             series: series,
@@ -215,7 +215,7 @@ describe InfluxdbLogger::Logger do
     end
   end
 
-  describe 'batch size', now: true do
+  describe 'batch size' do
     it 'inner logger write_points after every two messages if batch_size is set to 2' do
       logger = InfluxdbLogger::Logger.new(settings: settings, batch_size: 2)
       logger.info('message 1')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-logger
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Rallets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec