influxdb-logger 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f2d46b592a8e518d7b066a8dc8097f311fffe14
-  data.tar.gz: 6adc6aa9db9821ca75b05548745b2776fc17b1db
+  metadata.gz: cd80eaf9eda418f4e29e848e43c8fdc27af5313d
+  data.tar.gz: aea9e2e75e2cf55dad07ed6c7416c78f0eec351b
 SHA512:
-  metadata.gz: ab2d959f0ba12e9c0bc66942ec554a50b2e747fdfc5a4b9c4c08cb8573bf32506585b35e765d57fc7c4202915921be6f4f5215460141734e488ea913d249c2c8
-  data.tar.gz: 5242ee4f75b035a70588384c709f064a6b4af0f990e41030eadbdfb7fabda4e7c35c98362fb521fccae88cb57995d99aaf6937331ae3d613f9ec919760e791cf
+  metadata.gz: ebdebe6c27c0cd8c7165fdf71e42f5fc416aa6573d85129ee2ed72734ed9eba0fd7e09cb8f368912859524b009d5251ae3470a102d9e239bfa7110d06c3b82c4
+  data.tar.gz: b9014899996b8f54788062748c91f1171ab290a63b674c222f67b87a344c1755c4f6be31bef47e406e08c7c7d2d53bb3a7e1207d79c3ae78b6952beedda45edb

data/README.md

@@ -1,6 +1,6 @@
 # influxdb-logger (Rails)
 
-Log to Influxdb in Rails
+**Logger** for **Influxdb** in **Rails**
 
 ## Supported versions
 
@@ -10,7 +10,7 @@ Log to Influxdb in Rails
 
 Add this line to your application's Gemfile:
 
-    gem 'influxdb-logger', '5.1.4'
+    gem 'influxdb-logger', '1.0.1'
 
 And then execute:
 
@@ -81,6 +81,12 @@ Supported parameters for `InfluxdbLogger::Logger.new`:
       })
   ```
 
+* `async`: Determines whether the logger write asynchronously to influxdb, default to `false`. Read code [here](https://github.com/influxdata/influxdb-ruby/blob/master/lib/influxdb/writer/async.rb#L48) to know how it works.
+  ```ruby
+      InfluxdbLogger::Logger.new(async: false, ...)
+  ```
+
+
 ## Contributing
 
 1. Fork it

data/lib/influxdb-logger/logger.rb

@@ -5,14 +5,37 @@ require 'cgi'
 
 
 class Time
+  def to_precision(precision)
+    case precision
+    when 'ns'
+      self.to_ns
+    when 'u'
+      (self.to_r * 1000000).to_i
+    when 'ms'
+      self.to_ms
+    when 's'
+      self.to_i
+    when 'm'
+      self.to_i / 60
+    when 'h'
+      self.to_i / 3600
+    else
+      self.to_ns
+    end
+  end
+
+  def to_ns
+    (self.to_r * 1000000000).to_i
+  end
+
   def to_ms
-    (self.to_f * 1000.0).to_i
+    (self.to_r * 1000).to_i
   end
 end
 
 module InfluxdbLogger
   def log_to_file(message) # for test
-    open("#{Rails.root}/log/my.log", 'w') { |f|
+    open("#{Rails.root}/log/my.log", 'a') { |f|
       f.puts message.inspect
     }
   end
@@ -22,7 +45,7 @@ module InfluxdbLogger
     # Severity label for logging. (max 5 char)
     SEV_LABEL = %w(DEBUG INFO WARN ERROR FATAL ANY)
 
-    def self.new(log_tags: {}, settings: {}, batch_size: 1000, interval: 1000)
+    def self.new(async: true, log_tags: {}, settings: {}, batch_size: 1000, interval: 1000)
       Rails.application.config.log_tags = log_tags.values
       if Rails.application.config.respond_to?(:action_cable)
         Rails.application.config.action_cable.log_tags = log_tags.values.map do |x|
@@ -43,6 +66,7 @@ module InfluxdbLogger
 
       settings[:batch_size] ||= batch_size
       settings[:interval] ||= interval
+      settings[:async] = async
 
       level = SEV_LABEL.index(Rails.application.config.log_level.to_s.upcase)
       logger = InfluxdbLogger::InnerLogger.new(settings, level, log_tags)
@@ -84,17 +108,16 @@ module InfluxdbLogger
       @batch_size = options[:batch_size]
       @interval = options[:interval]
       @series = options[:series]
+      @retention = options[:retention]
       @global_tags = {}
       @last_flush_time = Time.now.to_ms
       @value_filter = options[:value_filter] || {}
+      @time_precision = options[:time_precision] || 'ns'
 
       @influxdb_logger = InfluxDB::Client.new(
-        host: options[:host],
-        database: options[:database],
-        retry: options[:retry],
-        username: options[:username],
-        password: options[:password],
-        time_precision: options[:time_precision]
+        **options.slice(:host, :database, :retry, :username, :password, :async),
+        time_precision: @time_precision,
+        discard_write_errors: true
       )
 
       @severity = 0
@@ -167,7 +190,7 @@ module InfluxdbLogger
 
       message = {
         series: @series,
-        timestamp: Time.now.to_ms,
+        timestamp: Time.now.to_precision(@time_precision),
         tags: tags,
         values: values.merge({
           severity: format_severity(@severity)
@@ -191,7 +214,7 @@ module InfluxdbLogger
 
     def flush
       return if @messages.empty?
-      @influxdb_logger.write_points(@messages)
+      @influxdb_logger.write_points(@messages, @time_precision, @retention)
       @severity = 0
       @messages.clear
       @last_flush_time = Time.now.to_ms

data/lib/influxdb-logger/version.rb

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

data/spec/logger_spec.rb

@@ -40,7 +40,7 @@ describe InfluxdbLogger::Logger do
         @log << point
       end
 
-      def write_points(points)
+      def write_points(points, time_precision, rentention = nil)
         @log ||= []
         @log.concat(points)
       end
@@ -206,7 +206,8 @@ describe InfluxdbLogger::Logger do
             time_precision: "ms",
             retry: 3,
             batch_size: 1000,
-            interval: 1000
+            interval: 1000,
+            async: true
           })
           ActiveSupport::Logger.new(STDOUT)
         end

metadata

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