fluent-logger 0.4.10 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c28c12beb5dd5c132b8b110bc75f91e396871395
-  data.tar.gz: 719e9ca555e70f8e6546c75f090169b7701787c2
+  metadata.gz: d93795042f622581efc248bfb4458418a56487c6
+  data.tar.gz: 96e4b0d775212bb6094dea72de1625a9fc80e38e
 SHA512:
-  metadata.gz: 964de8579891ba48e5b8a74cc15d40068ec5530082233db9600c3ff1b4e35c3e08197d469c0631039dd9bd6175de26a565197b29df7425a21565fd4301139e7d
-  data.tar.gz: 1ad8bf051fb2d9f31f89093d8e642651904f7e169080cfdbdb15163e06777bd9d63593a56a5e1b14add881cd172ef39e624f179bb44eed258d2d9a6608e36e34
+  metadata.gz: 54f9d02fd16d99b4bc2f2be8ad73b66b43386c1f01022b1f1c4c671ef22df9a8ca0cf53c1fa06cd5a13423952d19e5a65dc8688718a98fd60fbfce68ec0eca65
+  data.tar.gz: e7172605473f80a5ea13f910a1de12c663070d123c9e242f896715c59ec5180e5b137b6d1a172ddaf5c2860957a83e1eb7b69a01880facf01282d1b1396dad79

data/.travis.yml

@@ -4,15 +4,15 @@ rvm:
  - 1.9.3
  - 2.0.0
  - 2.1
+ - 2.2
  - ree
  - rbx
 
-before_install: git submodule update -i
-
 script: bundle exec rake spec
 
 matrix:
   allow_failures:
     - rvm: 1.8.7
+    - rvm: 1.9.2
     - rvm: ree
     - rvm: rbx

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.5.0 - 2015/01/25
+
+  * Use json instead of yajl. If you pass an invalid string to post, you may get 'invalid byte sequence' error.
+  * Support JRuby environment
+
 Release 0.4.10 - 2015/01/10
 
   * Call closed? in connect? method to check connection is closed or not

data/Gemfile

@@ -7,5 +7,5 @@ gem "simplecov", :require => false
 gem "simplecov-vim"
 
 gem 'yajl-ruby' # FIXME ruby 1.8.7 don't work add_dependency('yajl-ruby')
-gem "fluentd", :path => 'vendor/fluentd' if RUBY_VERSION >= "1.9.2"
-
+gem "fluentd"
+gem 'test-unit'

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.5.0

data/fluent-logger.gemspec

@@ -16,11 +16,6 @@ end
 EOF
   }
 
-  unless File.exist?("vendor/fluentd/Gemfile")
-    puts "git submodule update -i"
-    system("git submodule update -i")
-  end
-
   gem.name        = %q{fluent-logger}
   gem.version     = version
   # gem.platform  = Gem::Platform::RUBY
@@ -35,7 +30,6 @@ EOF
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'yajl-ruby', '~> 1.0'
   gem.add_dependency "msgpack", [">= 0.4.4", "!= 0.5.0", "!= 0.5.1", "!= 0.5.2", "!= 0.5.3", "< 0.6.0"]
   gem.add_development_dependency 'rake', '>= 0.9.2'
   gem.add_development_dependency 'rspec', '>= 3.0.0'

data/lib/fluent/logger.rb

@@ -16,54 +16,52 @@
 #    limitations under the License.
 #
 module Fluent
+  module Logger
+    autoload :ConsoleLogger , 'fluent/logger/console_logger'
+    autoload :FluentLogger  , 'fluent/logger/fluent_logger'
+    autoload :LoggerBase    , 'fluent/logger/logger_base'
+    autoload :TestLogger    , 'fluent/logger/test_logger'
+    autoload :TextLogger    , 'fluent/logger/text_logger'
+    autoload :NullLogger    , 'fluent/logger/null_logger'
+    autoload :VERSION       , 'fluent/logger/version'
 
-module Logger
-  autoload :ConsoleLogger , 'fluent/logger/console_logger'
-  autoload :FluentLogger  , 'fluent/logger/fluent_logger'
-  autoload :LoggerBase    , 'fluent/logger/logger_base'
-  autoload :TestLogger    , 'fluent/logger/test_logger'
-  autoload :TextLogger    , 'fluent/logger/text_logger'
-  autoload :NullLogger    , 'fluent/logger/null_logger'
-  autoload :VERSION       , 'fluent/logger/version'
+    @@default_logger = nil
 
-  @@default_logger = nil
-
-  def self.new(*args)
-    if args.first.is_a?(Class) && args.first.ancestors.include?(LoggerBase)
-      type = args.shift
-    else
-      type = FluentLogger
+    def self.new(*args)
+      if args.first.is_a?(Class) && args.first.ancestors.include?(LoggerBase)
+        type = args.shift
+      else
+        type = FluentLogger
+      end
+      type.new(*args)
     end
-    type.new(*args)
-  end
 
-  def self.open(*args)
-    close
-    @@default_logger = new(*args)
-  end
+    def self.open(*args)
+      close
+      @@default_logger = new(*args)
+    end
 
-  def self.close
-    if @@default_logger
-      @@default_logger.close
-      @@default_logger = nil
+    def self.close
+      if @@default_logger
+        @@default_logger.close
+        @@default_logger = nil
+      end
     end
-  end
 
-  def self.post(tag, map)
-    @@default_logger.post(tag, map)
-  end
+    def self.post(tag, map)
+      @@default_logger.post(tag, map)
+    end
 
-  def self.post_with_time(tag, map, time)
-    @@default_logger.post_with_time(tag, map, time)
-  end
+    def self.post_with_time(tag, map, time)
+      @@default_logger.post_with_time(tag, map, time)
+    end
 
-  def self.default
-    @@default_logger ||= ConsoleLogger.new(STDOUT)
-  end
+    def self.default
+      @@default_logger ||= ConsoleLogger.new(STDOUT)
+    end
 
-  def self.default=(logger)
-    @@default_logger = logger
+    def self.default=(logger)
+      @@default_logger = logger
+    end
   end
 end
-
-end

data/lib/fluent/logger/console_logger.rb

@@ -18,40 +18,37 @@
 require 'fluent/logger/text_logger'
 
 module Fluent
-module Logger
-
-class ConsoleLogger < TextLogger
-  def initialize(out)
-    super()
-    require 'time'
-
-    if out.is_a?(String)
-      @io = File.open(out, "a")
-      @on_reopen = Proc.new { @io.reopen(out, "a") }
-    elsif out.respond_to?(:write)
-      @io = out
-      @on_reopen = Proc.new { }
-    else
-      raise "Invalid output: #{out.inspect}"
+  module Logger
+    class ConsoleLogger < TextLogger
+      def initialize(out)
+        super()
+        require 'time'
+
+        if out.is_a?(String)
+          @io = File.open(out, "a")
+          @on_reopen = Proc.new { @io.reopen(out, "a") }
+        elsif out.respond_to?(:write)
+          @io = out
+          @on_reopen = Proc.new { }
+        else
+          raise "Invalid output: #{out.inspect}"
+        end
+      end
+
+      attr_accessor :time_format
+
+      def reopen!
+        @on_reopen.call
+      end
+
+      def post_text(text)
+        @io.puts text
+      end
+
+      def close
+        @io.close
+        self
+      end
     end
   end
-
-  attr_accessor :time_format
-
-  def reopen!
-    @on_reopen.call
-  end
-
-  def post_text(text)
-    @io.puts text
-  end
-
-  def close
-    @io.close
-    self
-  end
-end
-
-
-end
 end

data/lib/fluent/logger/fluent_logger.rb

@@ -19,216 +19,212 @@ require 'msgpack'
 require 'socket'
 require 'monitor'
 require 'logger'
-require 'yajl'
+require 'json'
 
 module Fluent
-module Logger
-
-
-class FluentLogger < LoggerBase
-  BUFFER_LIMIT = 8*1024*1024
-  RECONNECT_WAIT = 0.5
-  RECONNECT_WAIT_INCR_RATE = 1.5
-  RECONNECT_WAIT_MAX = 60
-  RECONNECT_WAIT_MAX_COUNT =
-      (1..100).inject(RECONNECT_WAIT_MAX / RECONNECT_WAIT) {|r,i|
+  module Logger
+    class FluentLogger < LoggerBase
+      BUFFER_LIMIT = 8*1024*1024
+      RECONNECT_WAIT = 0.5
+      RECONNECT_WAIT_INCR_RATE = 1.5
+      RECONNECT_WAIT_MAX = 60
+      RECONNECT_WAIT_MAX_COUNT =
+        (1..100).inject(RECONNECT_WAIT_MAX / RECONNECT_WAIT) {|r,i|
         break i + 1 if r < RECONNECT_WAIT_INCR_RATE
         r / RECONNECT_WAIT_INCR_RATE
       }
 
-  def initialize(tag_prefix = '', *args)
-    super()
-
-    options = {
-      :host => 'localhost',
-      :port => 24224
-    }
-
-    case args.first
-    when String, Symbol
-      # backward compatible
-      options[:host] = args[0]
-      options[:port] = args[1] if args[1]
-    when Hash
-      options.update args.first
-    end
-
-    @tag_prefix = tag_prefix
-    @host = options[:host]
-    @port = options[:port]
-
-    @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
-
-    if logger = options[:logger]
-      @logger = logger
-    else
-      @logger = ::Logger.new(STDERR)
-      if options[:debug]
-        @logger.level = ::Logger::DEBUG
-      else
-        @logger.level = ::Logger::INFO
-      end
-    end
-
-    @last_error = {}
-
-    begin
-      connect!
-    rescue => e
-      set_last_error(e)
-      @logger.error "Failed to connect fluentd: #{$!}"
-      @logger.error "Connection will be retried."
-    end
-
-    at_exit { close }
-  end
+      def initialize(tag_prefix = '', *args)
+        super()
+
+        options = {
+          :host => 'localhost',
+          :port => 24224
+        }
+
+        case args.first
+        when String, Symbol
+          # backward compatible
+          options[:host] = args[0]
+          options[:port] = args[1] if args[1]
+        when Hash
+          options.update args.first
+        end
 
-  attr_accessor :limit, :logger, :log_reconnect_error_threshold
-  attr_reader :last_error
+        @tag_prefix = tag_prefix
+        @host = options[:host]
+        @port = options[:port]
 
-  def last_error
-    @last_error[Thread.current.object_id]
-  end
+        @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
+
+        if logger = options[:logger]
+          @logger = logger
+        else
+          @logger = ::Logger.new(STDERR)
+          if options[:debug]
+            @logger.level = ::Logger::DEBUG
+          else
+            @logger.level = ::Logger::INFO
+          end
+        end
 
-  def post_with_time(tag, map, time)
-    @logger.debug { "event: #{tag} #{map.to_json}" rescue nil } if @logger.debug?
-    tag = "#{@tag_prefix}.#{tag}" if @tag_prefix
-    write [tag, time.to_i, map]
-  end
+        @last_error = {}
 
-  def close
-    @mon.synchronize {
-      if @pending
         begin
-          send_data(@pending)
+          connect!
         rescue => e
           set_last_error(e)
-          @logger.error("FluentLogger: Can't send logs to #{@host}:#{@port}: #{$!}")
+          @logger.error "Failed to connect fluentd: #{$!}"
+          @logger.error "Connection will be retried."
         end
+
+        at_exit { close }
       end
-      @con.close if connect?
-      @con = nil
-      @pending = nil
-    }
-    self
-  end
 
-  def connect?
-    @con && !@con.closed?
-  end
+      attr_accessor :limit, :logger, :log_reconnect_error_threshold
+      attr_reader :last_error
 
-  private
-  def to_msgpack(msg)
-    begin
-      msg.to_msgpack
-    rescue NoMethodError
-      Yajl::Parser.parse( Yajl::Encoder.encode(msg) ).to_msgpack
-    end
-  end
+      def last_error
+        @last_error[Thread.current.object_id]
+      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 post_with_time(tag, map, time)
+        @logger.debug { "event: #{tag} #{map.to_json}" rescue nil } if @logger.debug?
+        tag = "#{@tag_prefix}.#{tag}" if @tag_prefix
+        write [tag, time.to_i, map]
+      end
 
-  def write(msg)
-    begin
-      data = to_msgpack(msg)
-    rescue => e
-      set_last_error(e)
-      @logger.error("FluentLogger: Can't convert to msgpack: #{msg.inspect}: #{$!}")
-      return false
-    end
+      def close
+        @mon.synchronize {
+          if @pending
+            begin
+              send_data(@pending)
+            rescue => e
+              set_last_error(e)
+              @logger.error("FluentLogger: Can't send logs to #{@host}:#{@port}: #{$!}")
+            end
+          end
+          @con.close if connect?
+          @con = nil
+          @pending = nil
+        }
+        self
+      end
 
-    @mon.synchronize {
-      if @pending
-        @pending << data
-      else
-        @pending = data
+      def connect?
+        @con && !@con.closed?
       end
 
-      # suppress reconnection burst
-      if !@connect_error_history.empty? && @pending.bytesize <= @limit
-        if Time.now.to_i - @connect_error_history.last < suppress_sec
-          return false
+      private
+      def to_msgpack(msg)
+        begin
+          msg.to_msgpack
+        rescue NoMethodError
+          JSON.parse(JSON.generate(msg)).to_msgpack
         end
       end
 
-      begin
-        send_data(@pending)
-        @pending = nil
-        true
-      rescue => e
-        set_last_error(e)
-        if @pending.bytesize > @limit
-          @logger.error("FluentLogger: Can't send logs to #{@host}:#{@port}: #{$!}")
-          @pending = nil
+      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
-        @con.close if connect?
-        @con = nil
-        false
       end
-    }
-  end
 
-  def send_data(data)
-    unless connect?
-      connect!
-    end
-    @con.write data
-    #while true
-    #  puts "sending #{data.length} bytes"
-    #  if data.length > 32*1024
-    #    n = @con.syswrite(data[0..32*1024])
-    #  else
-    #    n = @con.syswrite(data)
-    #  end
-    #  puts "sent #{n}"
-    #  if n >= data.bytesize
-    #    break
-    #  end
-    #  data = data[n..-1]
-    #end
-    true
-  end
+      def write(msg)
+        begin
+          data = to_msgpack(msg)
+        rescue => e
+          set_last_error(e)
+          @logger.error("FluentLogger: Can't convert to msgpack: #{msg.inspect}: #{$!}")
+          return false
+        end
 
-  def connect!
-    @con = TCPSocket.new(@host, @port)
-    @con.sync = true
-    @connect_error_history.clear
-    @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
+        @mon.synchronize {
+          if @pending
+            @pending << data
+          else
+            @pending = data
+          end
+
+          # suppress reconnection burst
+          if !@connect_error_history.empty? && @pending.bytesize <= @limit
+            if Time.now.to_i - @connect_error_history.last < suppress_sec
+              return false
+            end
+          end
+
+          begin
+            send_data(@pending)
+            @pending = nil
+            true
+          rescue => e
+            set_last_error(e)
+            if @pending.bytesize > @limit
+              @logger.error("FluentLogger: Can't send logs to #{@host}:#{@port}: #{$!}")
+              @pending = nil
+            end
+            @con.close if connect?
+            @con = nil
+            false
+          end
+        }
+      end
 
-    if @connect_error_history.size >= @log_reconnect_error_threshold && !@logged_reconnect_error
-      log_reconnect_error
-      @logged_reconnect_error = true
-    end
+      def send_data(data)
+        unless connect?
+          connect!
+        end
+        @con.write data
+        #while true
+        #  puts "sending #{data.length} bytes"
+        #  if data.length > 32*1024
+        #    n = @con.syswrite(data[0..32*1024])
+        #  else
+        #    n = @con.syswrite(data)
+        #  end
+        #  puts "sent #{n}"
+        #  if n >= data.bytesize
+        #    break
+        #  end
+        #  data = data[n..-1]
+        #end
+        true
+      end
 
-    raise e
-  end
+      def connect!
+        @con = TCPSocket.new(@host, @port)
+        @con.sync = true
+        @connect_error_history.clear
+        @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
 
-  def log_reconnect_error
-    @logger.error("FluentLogger: Can't connect to #{@host}:#{@port}(#{@connect_error_history.size} retried): #{$!}")
-  end
+        if @connect_error_history.size >= @log_reconnect_error_threshold && !@logged_reconnect_error
+          log_reconnect_error
+          @logged_reconnect_error = true
+        end
 
-  def set_last_error(e)
-    # TODO: Check non GVL env
-    @last_error[Thread.current.object_id] = e
-  end
-end
+        raise e
+      end
 
+      def log_reconnect_error
+        @logger.error("FluentLogger: Can't connect to #{@host}:#{@port}(#{@connect_error_history.size} retried): #{$!}")
+      end
 
-end
+      def set_last_error(e)
+        # TODO: Check non GVL env
+        @last_error[Thread.current.object_id] = e
+      end
+    end
+  end
 end

data/lib/fluent/logger/fluent_logger/cui.rb

@@ -1,46 +1,43 @@
-
 require 'fluent/logger'
 require 'optparse'
 
 module Fluent
-module Logger
-class FluentLogger
+  module Logger
+    class FluentLogger
+      module CUI
+        def post(args)
+          options = {
+            :port => '24224',
+            :host => 'localhost'
+          }
 
-module CUI
-  def post(args)
-    options = {
-      :port => '24224',
-      :host => 'localhost'
-    }
+          o = OptionParser.new
+          o.version = Fluent::Logger::VERSION
+          o.on('-t [tag (default nil)]') {|v| options[:tag] = v }
+          o.on('-p [port (default 24224)]') {|v| options[:port] = v }
+          o.on('-h [host (default localhost)]') {|v| options[:host] = v }
+          o.on('-v [key=value]') {|v| 
+            key, value = v.split('=')
+            (options[:data] ||= {})[key] = value
+          }
+          o.banner = 'Usage: fluent-post -t tag.foo.bar -v key1=value1 -v key2=value2'
+          args = args.to_a
+          args << '--help' if args.empty?
+          o.parse(args)
+          
+          f = Fluent::Logger::FluentLogger.new(nil, {
+              :host => options[:host],
+              :port => options[:port]
+            })
 
-    o = OptionParser.new
-    o.version = Fluent::Logger::VERSION
-    o.on('-t [tag (default nil)]') {|v| options[:tag] = v }
-    o.on('-p [port (default 24224)]') {|v| options[:port] = v }
-    o.on('-h [host (default localhost)]') {|v| options[:host] = v }
-    o.on('-v [key=value]') {|v| 
-      key, value = v.split('=')
-      (options[:data] ||= {})[key] = value
-    }
-    o.banner = 'Usage: fluent-post -t tag.foo.bar -v key1=value1 -v key2=value2'
-    args = args.to_a
-    args << '--help' if args.empty?
-    o.parse(args)
-    
-    f = Fluent::Logger::FluentLogger.new(nil, {
-      :host => options[:host],
-      :port => options[:port]
-    })
+          {
+            :success => f.post(options[:tag], options[:data]),
+            :data    => options[:data]
+          }
+        end
 
-    {
-      :success => f.post(options[:tag], options[:data]),
-      :data    => options[:data]
-    }
+        extend self
+      end
+    end
   end
-
-  extend self
-end
-
-end
-end
 end

data/lib/fluent/logger/logger_base.rb

@@ -16,24 +16,22 @@
 #    limitations under the License.
 #
 module Fluent
-module Logger
+  module Logger
+    class LoggerBase
+      def self.open(*args, &block)
+        Fluent::Logger.open(*args, &block)
+      end
 
-class LoggerBase
-  def self.open(*args, &block)
-    Fluent::Logger.open(*args, &block)
-  end
-
-  def post(tag, map)
-    raise ArgumentError.new("Second argument should kind of Hash (tag: #{map})") unless map.kind_of? Hash
-    post_with_time(tag, map, Time.now)
-  end
+      def post(tag, map)
+        raise ArgumentError.new("Second argument should kind of Hash (tag: #{map})") unless map.kind_of? Hash
+        post_with_time(tag, map, Time.now)
+      end
 
-  #def post_with_time(tag, map)
-  #end
+      #def post_with_time(tag, map)
+      #end
 
-  def close
+      def close
+      end
+    end
   end
 end
-
-end
-end

data/lib/fluent/logger/null_logger.rb

@@ -16,13 +16,11 @@
 #    limitations under the License.
 #
 module Fluent
-module Logger
-
-class NullLogger < LoggerBase
-  def post_with_time(tag, map, time)
-    false
+  module Logger
+    class NullLogger < LoggerBase
+      def post_with_time(tag, map, time)
+        false
+      end
+    end
   end
 end
-
-end
-end

data/lib/fluent/logger/test_logger.rb

@@ -16,36 +16,34 @@
 #    limitations under the License.
 #
 module Fluent
-module Logger
+  module Logger
+    class TestLogger < LoggerBase
+      def initialize(queue=[])
+        @queue = queue
+        @max = 1024
+      end
 
-class TestLogger < LoggerBase
-  def initialize(queue=[])
-    @queue = queue
-    @max = 1024
-  end
-
-  attr_accessor :max
-  attr_reader :queue
+      attr_accessor :max
+      attr_reader :queue
 
-  def post_with_time(tag, map, time)
-    while @queue.size > @max-1
-      @queue.shift
-    end
-    (class<<map;self;end).module_eval do
-      define_method(:tag) { tag }
-      define_method(:time) { time }
-    end
-    @queue << map
-    true
-  end
+      def post_with_time(tag, map, time)
+        while @queue.size > @max-1
+          @queue.shift
+        end
+        (class<<map;self;end).module_eval do
+          define_method(:tag) { tag }
+          define_method(:time) { time }
+        end
+        @queue << map
+        true
+      end
 
-  def tag_queue(tag)
-    @queue.find_all {|map| map.tag == tag }
-  end
+      def tag_queue(tag)
+        @queue.find_all {|map| map.tag == tag }
+      end
 
-  def close
+      def close
+      end
+    end
   end
 end
-
-end
-end

data/lib/fluent/logger/text_logger.rb

@@ -16,24 +16,22 @@
 #    limitations under the License.
 #
 module Fluent
-module Logger
+  module Logger
+    class TextLogger < LoggerBase
+      def initialize
+        require 'json'
+        @time_format = "%b %e %H:%M:%S"
+      end
 
-class TextLogger < LoggerBase
-  def initialize
-    require 'yajl'
-    @time_format = "%b %e %H:%M:%S"
+      def post_with_time(tag, map, time)
+        a = [time.strftime(@time_format), " ", tag, ":"]
+        map.each_pair { |k,v|
+          a << " #{k}="
+          a << JSON.dump(v)
+        }
+        post_text a.join
+        true
+      end
+    end
   end
-
-  def post_with_time(tag, map, time)
-    a = [time.strftime(@time_format), " ", tag, ":"]
-    map.each_pair {|k,v|
-      a << " #{k}="
-      a << Yajl::Encoder.encode(v)
-    }
-    post_text a.join
-    true
-  end
-end
-
-end
 end

data/lib/fluent/logger/version.rb

@@ -1,7 +1,7 @@
 module Fluent
 module Logger
 
-VERSION = '0.4.10'
+VERSION = '0.5.0'
 
 end
 end

data/spec/fluent_logger_spec.rb

@@ -1,19 +1,14 @@
 
 require 'spec_helper'
-if RUBY_VERSION < "1.9.2"
-
-describe Fluent::Logger::FluentLogger do
-  pending "fluentd don't work RUBY < 1.9.2"
-end
-
-else
 
 require 'fluent/load'
+require 'fluent/test'
 require 'tempfile'
 require 'logger'
 require 'socket'
 require 'stringio'
 require 'fluent/logger/fluent_logger/cui'
+require 'plugin/out_test'
 
 $log = Fluent::Log.new(StringIO.new) # XXX should remove $log from fluentd 
 
@@ -70,22 +65,17 @@ describe Fluent::Logger::FluentLogger do
 
   context "running fluentd" do
     before(:each) do
-      tmp = Tempfile.new('fluent-logger-config')
-      tmp.close(false)
-
-      File.open(tmp.path, 'w') {|f|
-        f.puts <<EOF
+      @config = Fluent::Config.parse(<<EOF, '(logger-spec)', '(logger-spec-dir)', true)
 <source>
-  type tcp
+  type forward
   port #{fluentd_port}
 </source>
 <match logger-test.**>
   type test
 </match>
 EOF
-      }
       Fluent::Test.setup
-      Fluent::Engine.read_config(tmp.path)
+      Fluent::Engine.run_configure(@config)
       @coolio_default_loop = nil
       @thread = Thread.new {
         @coolio_default_loop = Coolio::Loop.default
@@ -240,7 +230,4 @@ EOF
       end
     end
   end
-
-end
-
 end

data/spec/plugin/out_test.rb

@@ -0,0 +1,73 @@
+#
+# Fluentd
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+module Fluent
+  class TestOutput < Output
+    Plugin.register_output('test', self)
+
+    def initialize
+      @emit_streams = []
+      @name = nil
+    end
+
+    attr_reader :emit_streams, :name
+
+    def emits
+      all = []
+      @emit_streams.each {|tag,events|
+        events.each {|time,record|
+          all << [tag, time, record]
+        }
+      }
+      all
+    end
+
+    def events
+      all = []
+      @emit_streams.each {|tag,events|
+        all.concat events
+      }
+      all
+    end
+
+    def records
+      all = []
+      @emit_streams.each {|tag,events|
+        events.each {|time,record|
+          all << record
+        }
+      }
+      all
+    end
+
+    def configure(conf)
+      if name = conf['name']
+        @name = name
+      end
+    end
+
+    def start
+    end
+
+    def shutdown
+    end
+
+    def emit(tag, es, chain)
+      chain.next
+      @emit_streams << [tag, es.to_a]
+    end
+  end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent-logger
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +132,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".gitmodules"
 - ".rspec"
 - ".travis.yml"
 - AUTHORS
@@ -173,6 +158,7 @@ files:
 - spec/logger_base_spec.rb
 - spec/logger_spec.rb
 - spec/null_logger_spec.rb
+- spec/plugin/out_test.rb
 - spec/spec_helper.rb
 - spec/support/timecop.rb
 - spec/test_logger_spec.rb
@@ -195,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: fluent logger for ruby
@@ -205,6 +191,7 @@ test_files:
 - spec/logger_base_spec.rb
 - spec/logger_spec.rb
 - spec/null_logger_spec.rb
+- spec/plugin/out_test.rb
 - spec/spec_helper.rb
 - spec/support/timecop.rb
 - spec/test_logger_spec.rb

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/fluentd"]
-	path = vendor/fluentd
-	url = git://github.com/fluent/fluentd.git