fluent-logger 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b697bc01bf042c2ecafc345c71dd0c133d08519f
-  data.tar.gz: 490cf5426952cca33f6a6a98cd4d150ef2ddad43
+  metadata.gz: cfed8c8167db552fe22b3b030b62041a5b523636
+  data.tar.gz: fdca6f7fcb62bb64364ae76af2a05bb287756ba2
 SHA512:
-  metadata.gz: d72fb3e957716c2003be82e669da0d14902631f98c710e32b530a5c099bbd56ec1e91e4cc392da55c00c0aaf11de08431682458e5ef32fbcaa6c78bda2efa371
-  data.tar.gz: 16783931f838a10cf82346f918faff6d8bab0f47172eaaf1bbc991a01549f2e704a3c45fa32f379b6133a481ca6b9b3a2b54793e473cbec321773df05d41944c
+  metadata.gz: dae9cd5b7df431025125450fa88e53700d6a6b2b16d78ff327fb3e5f5ea4599023cec6afeae588251ba2e88a5e7d31cb6746466f9882fa855d68d0960be2026a
+  data.tar.gz: 0e3b5eb2f7a88a20295779c63a556201eb3d2c1098488f92a6dcc9ee93b5630f0d9770803ffc5c99d7370105ed244b50e49e0ed8c21001b493b9a331d858fb4e

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
  - 2.1
  - 2.2
  - 2.3.1
+ - 2.4.0
  - ruby-head
 
 gemfile:
@@ -27,5 +28,7 @@ matrix:
       gemfile: Gemfile.v0.12
     - rvm: 2.3.1
       gemfile: Gemfile.v0.12
+    - rvm: 2.4.0
+      gemfile: Gemfile.v0.12
     - rvm: ruby-head
       gemfile: Gemfile.v0.12

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.6.2 - 2017/01/17
+
+  * Add unix domain socket support for `in_unix`
+  * LevelFluentLogger uses standard compatible severity formatting
+
 Release 0.6.1 - 2016/11/02
 
   * Add LevelFluentLogger: Standard Logger compatible interface

data/README.md

@@ -11,8 +11,21 @@ A structured event logger
 ```ruby
 require 'fluent-logger'
 
-log = Fluent::Logger::FluentLogger.new(nil, :host=>'localhost', :port=>24224)
-unless log.post("myapp.access", {"agent"=>"foo"})
+log = Fluent::Logger::FluentLogger.new(nil, :host => 'localhost', :port => 24224)
+unless log.post("myapp.access", {"agent" => "foo"})
+  p log.last_error # You can get last error object via last_error method
+end
+
+# output: myapp.access {"agent":"foo"}
+```
+
+### UNIX socket
+
+```ruby
+require 'fluent-logger'
+
+log = Fluent::Logger::FluentLogger.new(nil, :socket_path => "/tmp/fluent.sock")
+unless log.post("myapp.access", {"agent" => "foo"})
   p log.last_error # You can get last error object via last_error method
 end
 
@@ -23,8 +36,8 @@ end
 ```ruby
 require 'fluent-logger'
 
-Fluent::Logger::FluentLogger.open(nil, :host=>'localhost', :port=>24224)
-Fluent::Logger.post("myapp.access", {"agent"=>"foo"})
+Fluent::Logger::FluentLogger.open(nil, :host => 'localhost', :port => 24224)
+Fluent::Logger.post("myapp.access", {"agent" => "foo"})
 
 # output: myapp.access {"agent":"foo"}
 ```
@@ -33,8 +46,8 @@ Fluent::Logger.post("myapp.access", {"agent"=>"foo"})
 ```ruby
 require 'fluent-logger'
 
-log = Fluent::Logger::FluentLogger.new('myapp', :host=>'localhost', :port=>24224)
-log.post("access", {"agent"=>"foo"})
+log = Fluent::Logger::FluentLogger.new('myapp', :host => 'localhost', :port => 24224)
+log.post("access", {"agent" => "foo"})
 
 # output: myapp.access {"agent":"foo"}
 ```
@@ -59,7 +72,7 @@ f.warn("some application running.")
 ```ruby
 require 'fluent-logger'
 f = Fluent::Logger::LevelFluentLogger.new('fluent')
-f.info("some_application"){"some application running."}
+f.info("some_application") {"some application running."}
 # output: fluent.info: {"level":"INFO","message":"some application running.","progname":"some_application"}
 ```
 
@@ -69,7 +82,7 @@ f.info("some_application"){"some application running."}
 require 'fluent-logger'
 f = Fluent::Logger::LevelFluentLogger.new('fluent')
 f.level = Logger::WARN
-f.info("some_application"){"some application running."}
+f.info("some_application") {"some application running."}
 ```
 
 Log level is ERROR so no output.
@@ -84,7 +97,7 @@ require 'fluent-logger'
 f = Fluent::Logger::LevelFluentLogger.new('fluent')
 
 f.formatter = proc do |severity, datetime, progname, message|
-  map = { level: severity.class == Fixnum ? %w(DEBUG INFO WARN ERROR FATAL ANY)[severity] : severity }
+  map = { level: severity }
   map[:message] = message if message
   map[:progname] = progname if progname
   map[:stage] = ENV['RAILS_ENV']
@@ -100,7 +113,7 @@ f.info("some_application"){"some application running."}
 
 ### Fluent
 ```ruby
-Fluent::Logger::FluentLogger.open('tag_prefix', :host=>'localhost', :port=>24224)
+Fluent::Logger::FluentLogger.open('tag_prefix', :host => 'localhost', :port => 24224)
 ```
 
 ### Console

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/fluent/logger/fluent_logger.rb

@@ -29,7 +29,7 @@ module Fluent
       RECONNECT_WAIT_INCR_RATE = 1.5
       RECONNECT_WAIT_MAX = 60
       RECONNECT_WAIT_MAX_COUNT =
-        (1..100).inject(RECONNECT_WAIT_MAX / RECONNECT_WAIT) {|r,i|
+        (1..100).inject(RECONNECT_WAIT_MAX / RECONNECT_WAIT) { |r, i|
         break i + 1 if r < RECONNECT_WAIT_INCR_RATE
         r / RECONNECT_WAIT_INCR_RATE
       }
@@ -54,16 +54,16 @@ module Fluent
         @tag_prefix = tag_prefix
         @host = options[:host]
         @port = options[:port]
+        @socket_path = options[:socket_path]
 
         @mon = Monitor.new
         @pending = nil
         @connect_error_history = []
 
         @limit = options[:buffer_limit] || BUFFER_LIMIT
-        @log_reconnect_error_threshold = options[:log_reconnect_error_threshold] ||  RECONNECT_WAIT_MAX_COUNT
+        @log_reconnect_error_threshold = options[:log_reconnect_error_threshold] || RECONNECT_WAIT_MAX_COUNT
 
         @buffer_overflow_handler = options[:buffer_overflow_handler]
-
         if logger = options[:logger]
           @logger = logger
         else
@@ -108,7 +108,7 @@ module Fluent
               send_data(@pending)
             rescue => e
               set_last_error(e)
-              @logger.error("FluentLogger: Can't send logs to #{@host}:#{@port}: #{$!}")
+              @logger.error("FluentLogger: Can't send logs to #{connection_string}: #{$!}")
               call_buffer_overflow_handler(@pending)
             end
           end
@@ -123,7 +123,20 @@ module Fluent
         @con && !@con.closed?
       end
 
+      def create_socket!
+        if @socket_path
+          @con = UNIXSocket.new(@socket_path)
+        else
+          @con = TCPSocket.new(@host, @port)
+        end
+      end
+
+      def connection_string
+        @socket_path ? "#{@socket_path}" : "#{@host}:#{@port}"
+      end
+
       private
+
       def to_msgpack(msg)
         begin
           msg.to_msgpack
@@ -170,7 +183,7 @@ module Fluent
           rescue => e
             set_last_error(e)
             if @pending.bytesize > @limit
-              @logger.error("FluentLogger: Can't send logs to #{@host}:#{@port}: #{$!}")
+              @logger.error("FluentLogger: Can't send logs to #{connection_string}: #{$!}")
               call_buffer_overflow_handler(@pending)
               @pending = nil
             end
@@ -203,7 +216,7 @@ module Fluent
       end
 
       def connect!
-        @con = TCPSocket.new(@host, @port)
+        create_socket!
         @con.sync = true
         @connect_error_history.clear
         @logged_reconnect_error = false
@@ -230,7 +243,7 @@ module Fluent
       end
 
       def log_reconnect_error
-        @logger.error("FluentLogger: Can't connect to #{@host}:#{@port}(#{@connect_error_history.size} retried): #{$!}")
+        @logger.error("FluentLogger: Can't connect to #{connection_string}(#{@connect_error_history.size} retried): #{$!}")
       end
 
       def set_last_error(e)

data/lib/fluent/logger/level_fluent_logger.rb

@@ -28,7 +28,7 @@ module Fluent
       def initialize(tag_prefix = nil, *args)
         @level = ::Logger::DEBUG
         @default_formatter = proc do |severity, datetime, progname, message|
-          map = { level: format_severity(severity) }
+          map = { level: severity }
           map[:message] = message if message
           map[:progname] = progname if progname
           map
@@ -50,7 +50,7 @@ module Fluent
             progname = @progname
           end
         end
-        map = format_message(severity, Time.now, progname, message)
+        map = format_message(format_severity(severity), Time.now, progname, message)
         @fluent_logger.post(format_severity(severity).downcase, map)
         true
       end

data/lib/fluent/logger/version.rb

@@ -1,7 +1,7 @@
 module Fluent
 module Logger
 
-VERSION = '0.6.1'
+VERSION = '0.6.2'
 
 end
 end

data/spec/fluent_logger_spec.rb

@@ -119,6 +119,8 @@ describe Fluent::Logger::FluentLogger do
         expect {
           logger.post('tag', data)
         }.to raise_error(ArgumentError)
+
+        fluentd.wait_transfer # ensure the fluentd accepted the connection
       }
     end
 
@@ -128,6 +130,7 @@ describe Fluent::Logger::FluentLogger do
         host, port = fluent_logger.instance_eval { [@host, @port] }
         expect(host).to eq 'localhost'
         expect(port).to eq fluentd.port
+        fluentd.wait_transfer # ensure the fluentd accepted the connection
       end
 
       it "hash argument" do
@@ -139,6 +142,7 @@ describe Fluent::Logger::FluentLogger do
         host, port = fluent_logger.instance_eval { [@host, @port] }
         expect(host).to eq 'localhost'
         expect(port).to eq fluentd.port
+        fluentd.wait_transfer # ensure the fluentd accepted the connection
       end
     end
   end
@@ -226,4 +230,44 @@ describe Fluent::Logger::FluentLogger do
       end
     end
   end
+
+  context "using socket_path" do
+
+    let(:socket_logger) {
+      @logger_io = StringIO.new
+      logger = ::Logger.new(@logger_io)
+      Fluent::Logger::FluentLogger.new('logger-test', {
+        :socket_path => fluentd.socket_path,
+        :logger => logger,
+        :buffer_overflow_handler => buffer_overflow_handler
+      })
+    }
+
+    context "running fluentd" do
+      before(:all) do
+        @serverengine = DummyServerengine.new
+        @serverengine.startup
+      end
+
+      before(:each) do
+        fluentd.socket_startup
+      end
+
+      after(:each) do
+        fluentd.shutdown
+      end
+
+      after(:all) do
+        @serverengine.shutdown
+      end
+
+      context('post') do
+        it ('success') {
+          expect(socket_logger.post('tag', {'b' => 'a'})).to be true
+          fluentd.wait_transfer
+          expect(fluentd.queue.last).to eq ['logger-test.tag', {'b' => 'a'}]
+        }
+      end
+    end
+  end
 end

data/spec/level_fluent_logger_spec.rb

@@ -57,12 +57,14 @@ describe Fluent::Logger::FluentLogger do
         })
         expect(level_fluent_logger.level).to eq 0
         expect(level_fluent_logger.progname).to be_nil
+        fluentd.wait_transfer # ensure the fluentd accepted the connection
       }
 
       it ('close') {
         expect(level_logger).to be_connect
         level_logger.close
         expect(level_logger).not_to be_connect
+        fluentd.wait_transfer # ensure the fluentd accepted the connection
       }
 
       it ('reopen') {
@@ -70,6 +72,7 @@ describe Fluent::Logger::FluentLogger do
         level_logger.reopen
         expect(level_logger).not_to be_connect
         expect(level_logger.info('logger reopen test')).to be true
+        fluentd.wait_transfer # ensure the fluentd accepted the connection
       }
     end
 
@@ -145,7 +148,7 @@ describe Fluent::Logger::FluentLogger do
       it ('define formatter') {
         level_logger.level = ::Logger::DEBUG
         level_logger.formatter = proc do |severity, datetime, progname, message|
-          map = { level: severity.class == Fixnum ? %w(DEBUG INFO WARN ERROR FATAL ANY)[severity] : severity }
+          map = { level: severity }
           map[:message] = message if message
           map[:progname] = progname if progname
           map[:stage] = "development"

data/spec/support/dummy_fluentd.rb

@@ -9,7 +9,8 @@ class DummyFluentd
     output.emits.clear rescue nil
   end
 
-  WAIT = ENV['WAIT'] ? ENV['WAIT'].to_f : 0.1
+  WAIT = ENV['WAIT'] ? ENV['WAIT'].to_f : 0.3
+  SOCKET_PATH = ENV['SOCKET_PATH'] || "/tmp/dummy_fluent.sock"
 
   def wait_transfer
     sleep WAIT
@@ -29,6 +30,10 @@ class DummyFluentd
     @port
   end
 
+  def socket_path
+    SOCKET_PATH
+  end
+
   def output
     sleep 0.0001 # next tick
     if Fluent::Engine.respond_to?(:match)
@@ -40,7 +45,7 @@ class DummyFluentd
 
   def queue
     queue = []
-    output.emits.each {|tag, time, record|
+    output.emits.each { |tag, time, record|
       queue << [tag, record]
     }
     queue
@@ -66,6 +71,26 @@ EOF
     wait_transfer
   end
 
+  def socket_startup
+    config = Fluent::Config.parse(<<EOF, '(logger-spec)', '(logger-spec-dir)', true)
+<source>
+  type unix
+  path #{socket_path}
+</source>
+<match logger-test.**>
+  type test
+</match>
+EOF
+    Fluent::Test.setup
+    Fluent::Engine.run_configure(config)
+    @coolio_default_loop = nil
+    @thread = Thread.new {
+      @coolio_default_loop = Coolio::Loop.default
+      Fluent::Engine.run
+    }
+    wait_transfer
+  end
+
   def shutdown
     @coolio_default_loop.stop rescue nil
     begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-logger
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: fluent logger for ruby