fluent-logger 0.4.6 → 0.4.7

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.4.7 - 2013/11/21
+
+  * Suppress log error message with :log_reconnect_error_threshold option
+  * Add FluentLogger#last_error method to get last exception in user code
+
 Release 0.4.6 - 2013/06/17
 
   * Raise an ArgumentError when passes invalid argument to post method

data/README.md

@@ -0,0 +1,63 @@
+# Fluent logger
+A structured event loger
+
+## Examples
+
+### Simple
+
+```ruby
+require 'fluent-logger'
+
+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"}
+```
+
+### Singleton
+```ruby
+require 'fluent-logger'
+
+Fluent::Logger::FluentLogger.open(nil, :host=>'localhost', :port=>24224)
+Fluent::Logger.post("myapp.access", {"agent"=>"foo"})
+
+# output: myapp.access {"agent":"foo"}
+```
+
+### Tag prefix
+```ruby
+require 'fluent-logger'
+
+log = Fluent::Logger::FluentLogger.new('myapp', :host=>'localhost', :port=>24224)
+log.post("access", {"agent"=>"foo"})
+
+# output: myapp.access {"agent":"foo"}
+```
+
+## Loggers
+
+### Fluent
+```ruby
+Fluent::Logger::FluentLogger.open('tag_prefix', :host=>'localhost', :port=24224)
+```
+
+### Console
+```ruby
+Fluent::Logger::ConsoleLogger.open(io)
+```
+
+### Null
+```ruby
+Fluent::Logger::NullLogger.open
+```
+
+|name|description|
+|---|---|
+|Web site|http://fluent.github.com/|
+|Documents|http://fluent.github.com/doc/|
+|Source repository|https://github.com/fluent/fluent-logger-ruby|
+|Author|Sadayuki Furuhashi|
+|Copyright|(c) 2011 FURUHASHI Sadayuki|
+|License|Apache License, Version 2.0|

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/lib/fluent/logger/fluent_logger.rb

@@ -81,6 +81,7 @@ class FluentLogger < LoggerBase
     @connect_error_history = []
 
     @limit = options[:buffer_limit] || BUFFER_LIMIT
+    @log_reconnect_error_threshold = options[:log_reconnect_error_threshold] ||  RECONNECT_WAIT_MAX_COUNT
 
     if logger = options[:logger]
       @logger = logger
@@ -93,15 +94,23 @@ class FluentLogger < LoggerBase
       end
     end
 
+    @last_error = {}
+
     begin
       connect!
-    rescue
+    rescue => e
+      set_last_error(e)
       @logger.error "Failed to connect fluentd: #{$!}"
       @logger.error "Connection will be retried."
     end
   end
 
-  attr_accessor :limit, :logger
+  attr_accessor :limit, :logger, :log_reconnect_error_threshold
+  attr_reader :last_error
+
+  def last_error
+    @last_error[Thread.current.object_id]
+  end
 
   def post_with_time(tag, map, time)
     @logger.debug { "event: #{tag} #{map.to_json}" rescue nil }
@@ -114,7 +123,8 @@ class FluentLogger < LoggerBase
       if @pending
         begin
           send_data(@pending)
-        rescue
+        rescue => e
+          set_last_error(e)
           @logger.error("FluentLogger: Can't send logs to #{@host}:#{@port}: #{$!}")
         end
       end
@@ -142,10 +152,19 @@ class FluentLogger < LoggerBase
     end
   end
 
+  def suppress_sec
+    if (sz = @connect_error_history.size) < RECONNECT_WAIT_MAX_COUNT
+      RECONNECT_WAIT * (RECONNECT_WAIT_INCR_RATE ** (sz - 1))
+    else
+      RECONNECT_WAIT_MAX
+    end
+  end
+
   def write(msg)
     begin
       data = to_msgpack(msg)
-    rescue
+    rescue => e
+      set_last_error(e)
       @logger.error("FluentLogger: Can't convert to msgpack: #{msg.inspect}: #{$!}")
       return false
     end
@@ -159,11 +178,6 @@ class FluentLogger < LoggerBase
 
       # suppress reconnection burst
       if !@connect_error_history.empty? && @pending.bytesize <= @limit
-        if (sz = @connect_error_history.size) < RECONNECT_WAIT_MAX_COUNT
-          suppress_sec = RECONNECT_WAIT * (RECONNECT_WAIT_INCR_RATE ** (sz - 1))
-        else
-          suppress_sec = RECONNECT_WAIT_MAX
-        end
         if Time.now.to_i - @connect_error_history.last < suppress_sec
           return false
         end
@@ -173,7 +187,8 @@ class FluentLogger < LoggerBase
         send_data(@pending)
         @pending = nil
         true
-      rescue
+      rescue => e
+        set_last_error(e)
         if @pending.bytesize > @limit
           @logger.error("FluentLogger: Can't send logs to #{@host}:#{@port}: #{$!}")
           @pending = nil
@@ -210,12 +225,28 @@ class FluentLogger < LoggerBase
     @con = TCPSocket.new(@host, @port)
     @con.sync = true
     @connect_error_history.clear
-  rescue
+    @logged_reconnect_error = false
+  rescue => e
     @connect_error_history << Time.now.to_i
     if @connect_error_history.size > RECONNECT_WAIT_MAX_COUNT
       @connect_error_history.shift
     end
-    raise
+
+    if @connect_error_history.size >= @log_reconnect_error_threshold && !@logged_reconnect_error
+      log_reconnect_error
+      @logged_reconnect_error = true
+    end
+
+    raise e
+  end
+
+  def log_reconnect_error
+    @logger.error("FluentLogger: Can't connect to #{@host}:#{@port}(#{@connect_error_history.size} retried): #{$!}")
+  end
+
+  def set_last_error(e)
+    # TODO: Check non GVL env
+    @last_error[Thread.current.object_id] = e
   end
 end
 

data/lib/fluent/logger/version.rb

@@ -1,7 +1,7 @@
 module Fluent
 module Logger
 
-VERSION = '0.4.6'
+VERSION = '0.4.7'
 
 end
 end

data/spec/fluent_logger_spec.rb

@@ -225,6 +225,19 @@ EOF
         logger_io.rewind
         logger_io.read.should =~ /Can't send logs to/
       end
+
+      it ('log connect error once') do
+        logger.stub(:suppress_sec).and_return(-1)
+        logger.log_reconnect_error_threshold = 1
+        logger.should_receive(:log_reconnect_error).once.and_call_original
+
+        logger.post('tag', {'a' => 'b'})
+        wait_transfer  # even if wait
+        logger.post('tag', {'a' => 'b'})
+        wait_transfer  # even if wait
+        logger_io.rewind
+        logger_io.read.should =~ /Can't connect to/
+      end
     end
   end
 

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: fluent-logger
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
+  prerelease: 
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,20 +30,21 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.3
     - - <
@@ -49,20 +53,21 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.3
     - - <
@@ -71,57 +76,65 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 description: fluent logger for ruby
@@ -139,7 +152,7 @@ files:
 - COPYING
 - ChangeLog
 - Gemfile
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/fluent-post
@@ -164,26 +177,33 @@ files:
 - spec/test_logger_spec.rb
 homepage: https://github.com/fluent/fluent-logger-ruby
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3553729463111660525
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3553729463111660525
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: fluent logger for ruby
 test_files:
 - spec/console_logger_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 646a1e0a022169db9fa2392e5e4e4077b98fe82d
-  data.tar.gz: bc397f0a66e90d51e6c5d10912f2c735f8feab6c
-SHA512:
-  metadata.gz: 4ab7cc6f13741664506d4ecb537effb9630efaf8cfc81f496dfc2d9d65ee944d9f835b21e95c45d8133c51e98e7992ffb5d5a512ce14e6a630f6aff714be94d7
-  data.tar.gz: 762bd7f474ea59cd7e689eb20d99d3926f7acd821bd9121c49afddb0ce2da1e47cbdf6ed144c3f296ce56a952c5358c32123702d99938508ea6b77541bfdb146

data/README.rdoc

@@ -1,55 +0,0 @@
-= Fluent logger
-
-A structured event loger
-
-== Examples
-
-=== Simple
-
-    require 'fluent-logger'
-    
-    log = Fluent::Logger::FluentLogger.new(nil, :host=>'localhost', :port=>24224)
-    log.post("myapp.access", {"agent"=>"foo"})
-    
-    # output: myapp.access {"agent":"foo"}
-
-=== Singleton
-
-    require 'fluent-logger'
-    
-    Fluent::Logger::FluentLogger.open(nil, :host=>'localhost', :port=>24224)
-    Fluent::Logger.post("myapp.access", {"agent"=>"foo"})
-    
-    # output: myapp.access {"agent":"foo"}
-
-=== Tag prefix
-
-    require 'fluent-logger'
-    
-    log = Fluent::Logger::FluentLogger.new('myapp', :host=>'localhost', :port=>24224)
-    log.post("access", {"agent"=>"foo"})
-    
-    # output: myapp.access {"agent":"foo"}
-
-== Loggers
-
-=== Fluent
-
-    Fluent::Logger::FluentLogger.open('tag_prefix', :host=>'localhost', :port=24224)
-
-=== Console
-
-    Fluent::Logger::ConsoleLogger.open(io)
-
-=== Null
-
-    Fluent::Logger::NullLogger.open
-
-
-Web site::  http://fluent.github.com/
-Documents:: http://fluent.github.com/doc/
-Source repository:: https://github.com/fluent/fluent-logger-ruby
-Author:: Sadayuki Furuhashi
-Copyright:: (c) 2011 FURUHASHI Sadayuki
-License:: Apache License, Version 2.0
-