fluent-logger 0.4.7 → 0.4.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 79e6006d4a147c6c52b987b487e585df98b05e4e
+  data.tar.gz: 7cb27442e72fc83776592c3dbf5c6ac857f4ee23
+SHA512:
+  metadata.gz: 5569f59598c255e75b9908d9b2e06186f0d95f7c601324b2874d062b98bdf89f216f423136a9ec5b39f6f36a342519e415f7ba2b9647968b3019e05a0f80dc95
+  data.tar.gz: c0fd9d30beb244b380a24c08d70af4f4c58a04a1eec49dd2c20779f60676923f80cb895e4784a94bf26d56b0baf7e99febbd5eacc413977af08886c15f72db74

data/.travis.yml

@@ -3,8 +3,16 @@ rvm:
  - 1.9.2
  - 1.9.3
  - 2.0.0
+ - 2.1.0
  - ree
+ - rbx
 
 before_install: git submodule update -i
 
 script: bundle exec rake spec
+
+matrix:
+  allow_failures:
+    - rvm: 1.8.7
+    - rvm: ree
+    - rvm: rbx

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.4.8 - 2014/04/12
+
+  * Use at_exit for logger finalization
+  * Fix unable to construct a default logger of non-default type
+
 Release 0.4.7 - 2013/11/21
 
   * Suppress log error message with :log_reconnect_error_threshold option

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/lib/fluent/logger/fluent_logger.rb

@@ -26,25 +26,6 @@ module Logger
 
 
 class FluentLogger < LoggerBase
-  module Finalizable
-    require 'delegate'
-    def new(*args, &block)
-      obj = allocate
-      obj.instance_eval { initialize(*args, &block) }
-      dc = DelegateClass(obj.class).new(obj)
-      ObjectSpace.define_finalizer(dc, finalizer(obj))
-      dc
-    end
-
-    def finalizer(obj)
-      fin = obj.method(:finalize)
-      proc {|id|
-        fin.call
-      }
-    end
-  end
-  extend Finalizable
-
   BUFFER_LIMIT = 8*1024*1024
   RECONNECT_WAIT = 0.5
   RECONNECT_WAIT_INCR_RATE = 1.5
@@ -55,7 +36,7 @@ class FluentLogger < LoggerBase
         r / RECONNECT_WAIT_INCR_RATE
       }
 
-  def initialize(tag_prefix, *args)
+  def initialize(tag_prefix = '', *args)
     super()
 
     options = {
@@ -103,6 +84,8 @@ class FluentLogger < LoggerBase
       @logger.error "Failed to connect fluentd: #{$!}"
       @logger.error "Connection will be retried."
     end
+
+    at_exit { close }
   end
 
   attr_accessor :limit, :logger, :log_reconnect_error_threshold
@@ -139,10 +122,6 @@ class FluentLogger < LoggerBase
     !!@con
   end
 
-  def finalize
-    close
-  end
-
   private
   def to_msgpack(msg)
     begin

data/lib/fluent/logger/logger_base.rb

@@ -20,7 +20,7 @@ module Logger
 
 class LoggerBase
   def self.open(*args, &block)
-    Fluent::Logger.open(self, *args, &block)
+    Fluent::Logger.open(*args, &block)
   end
 
   def post(tag, map)

data/lib/fluent/logger/version.rb

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

data/spec/fluent_logger_spec.rb

@@ -179,7 +179,7 @@ EOF
       it "backward compatible" do
         port = fluentd_port
         fluent_logger = Fluent::Logger::FluentLogger.new('logger-test', 'localhost', port)
-        fluent_logger.method_missing(:instance_eval) { # fluent_logger is delegetor
+        fluent_logger.instance_eval {
           @host.should == 'localhost'
           @port.should == port
         }
@@ -191,7 +191,7 @@ EOF
           :host => 'localhost',
           :port => port
         })
-        fluent_logger.method_missing(:instance_eval) { # fluent_logger is delegetor
+        fluent_logger.instance_eval {
           @host.should == 'localhost'
           @port.should == port
         }
@@ -227,16 +227,16 @@ EOF
       end
 
       it ('log connect error once') do
-        logger.stub(:suppress_sec).and_return(-1)
+        Fluent::Logger::FluentLogger.any_instance.stub(:suppress_sec).and_return(-1)
         logger.log_reconnect_error_threshold = 1
-        logger.should_receive(:log_reconnect_error).once.and_call_original
+        Fluent::Logger::FluentLogger.any_instance.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/
+        logger_io.read.should =~ /Failed to connect/
       end
     end
   end

data/spec/logger_spec.rb

@@ -28,8 +28,7 @@ describe Fluent::Logger do
       Fluent::Logger.open('tag-prefix', {
         :logger => ::Logger.new(fluent_logger_logger_io)
       })
-      # Fluent::Logger::FluentLogger is delegator
-      Fluent::Logger.default.method_missing(:kind_of?, Fluent::Logger::FluentLogger).should be_true
+      Fluent::Logger.default.kind_of?(Fluent::Logger::FluentLogger).should be_true
     }
 
     it('open with BaseLogger class') {

metadata

@@ -1,140 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: fluent-logger
 version: !ruby/object:Gem::Version
-  version: 0.4.7
-  prerelease: 
+  version: 0.4.8
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2014-04-12 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
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !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
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 0.6.0
   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
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !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
@@ -144,10 +131,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".rspec"
+- ".travis.yml"
 - AUTHORS
 - COPYING
 - ChangeLog
@@ -177,33 +164,26 @@ 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: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: fluent logger for ruby
 test_files:
 - spec/console_logger_spec.rb