fluent-logger 0.3.1 → 0.4.0

data/lib/fluent/logger/fluent.rb

@@ -1,121 +0,0 @@
-#
-# Fluent
-#
-# Copyright (C) 2011 FURUHASHI Sadayuki
-#
-#    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
-module Logger
-
-
-class FluentLogger < LoggerBase
-  BUFFER_LIMIT = 8*1024*1024
-
-  def initialize(tag, host, port=24224)
-    super()
-    require 'msgpack'
-    require 'socket'
-    require 'monitor'
-    require 'logger'
-    @mon = Monitor.new
-
-    @tag = tag
-
-    @pending = nil
-    @host = host
-    @port = port
-
-    @limit = BUFFER_LIMIT
-    @logger = ::Logger.new(STDERR)
-
-    begin
-      connect!
-    rescue
-      @logger.error "Failed to connect fluentd: #{$!}"
-      @logger.error "Connection will be retried."
-    end
-
-    FluentLogger.close_on_exit(self)
-  end
-
-  attr_accessor :limit, :logger
-
-  def post(tag, map)
-    time = Time.now.to_i
-    write ["#{@tag}.#{tag}", time, map]
-  end
-
-  def close
-    if @pending
-      @logger.error("FluentLogger: Can't send logs to #{@host}:#{@port}")
-    end
-    @con.close if @con
-    @con = nil
-    @pending = nil
-    self
-  end
-
-  private
-  def write(msg)
-    data = msg.to_msgpack
-    @mon.synchronize {
-      if @pending
-        @pending << data
-        data = @pending
-      end
-      begin
-        unless @con
-          connect!
-        end
-        while true
-          n = @con.syswrite(data)
-          if n >= data.bytesize
-            break
-          end
-          data = data[n..-1]
-        end
-        @pending = nil
-      rescue
-        if @pending
-          if @pending.bytesize > @limit
-            @logger.error("FluentLogger: Can't send logs to #{@host}:#{@port}")
-            @pending = nil
-          end
-        else
-          @pending = data
-        end
-        @con.close if @con
-        @con = nil
-      end
-    }
-  end
-
-  def connect!
-    @con = TCPSocket.new(@host, @port)
-  end
-
-  def self.close_on_exit(logger)
-    ObjectSpace.define_finalizer(logger, self.finalizer(logger))
-  end
-
-  def self.finalizer(logger)
-    proc {
-      logger.close
-    }
-  end
-end
-
-
-end
-end

data/lib/fluent/logger/syslog.rb

@@ -1,127 +0,0 @@
-#
-# Fluent
-#
-# Copyright (C) 2011 FURUHASHI Sadayuki
-#
-#    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
-module Logger
-
-
-class SyslogLogger < TextLogger
-  def initialize(ident=$0, level=:info)
-    super()
-    require 'syslog'
-
-    @ident = ident
-    self.level = level
-    #self.facility = facility
-    Syslog.open(@ident)
-  end
-
-  attr_reader :level
-
-  def level=(level)
-    level = level.to_sym if level.is_a?(String)
-    @level = case level
-      when :emerg, Syslog::LOG_EMERG
-        Syslog::LOG_EMERG
-      when :alert, Syslog::LOG_ALERT
-        Syslog::LOG_ALERT
-      when :crit, Syslog::LOG_CRIT
-        Syslog::LOG_CRIT
-      when :err, :error, Syslog::LOG_ERR
-        Syslog::LOG_ERR
-      when :warning, :warn, Syslog::LOG_WARNING
-        Syslog::LOG_WARNING
-      when :notice, Syslog::LOG_NOTICE
-        Syslog::LOG_NOTICE
-      when :info, Syslog::LOG_INFO
-        Syslog::LOG_INFO
-      when :debug, Syslog::LOG_DEBUG
-        Syslog::LOG_DEBUG
-      else
-        raise "Unknown level description #{level.inspect}"
-      end
-  end
-
-  #def facility=(facility)
-  #  facility = facility.to_sym if facility.is_a?(String)
-  #  @facility = case facility
-  #    when :auth, Syslog::LOG_AUTH
-  #      Syslog::LOG_AUTH
-  #    when :authpriv, Syslog::LOG_AUTHPRIV
-  #      Syslog::LOG_AUTHPRIV
-  #    when :console, Syslog::LOG_CONSOLE
-  #      Syslog::LOG_CONSOLE
-  #    when :cron, Syslog::LOG_CRON
-  #      Syslog::LOG_CRON
-  #    when :daemon, Syslog::LOG_DAEMON
-  #      Syslog::LOG_DAEMON
-  #    when :ftp, Syslog::LOG_FTP
-  #      Syslog::LOG_FTP
-  #    when :kern, Syslog::LOG_KERN
-  #      Syslog::LOG_KERN
-  #    when :lpr, Syslog::LOG_LPR
-  #      Syslog::LOG_LPR
-  #    when :mail, Syslog::LOG_MAIL
-  #      Syslog::LOG_MAIL
-  #    when :news, Syslog::LOG_NEWS
-  #      Syslog::LOG_NEWS
-  #    when :ntp, Syslog::LOG_NTP
-  #      Syslog::LOG_NTP
-  #    when :security, Syslog::LOG_SECURITY
-  #      Syslog::LOG_SECURITY
-  #    when :syslog, Syslog::LOG_SYSLOG
-  #      Syslog::LOG_SYSLOG
-  #    when :user, Syslog::LOG_USER
-  #      Syslog::LOG_USER
-  #    when :uucp, Syslog::LOG_UUCP
-  #      Syslog::LOG_UUCP
-  #    when :local0, Syslog::LOG_LOCAL0
-  #      Syslog::LOG_LOCAL0
-  #    when :local1, Syslog::LOG_LOCAL1
-  #      Syslog::LOG_LOCAL1
-  #    when :local2, Syslog::LOG_LOCAL2
-  #      Syslog::LOG_LOCAL2
-  #    when :local3, Syslog::LOG_LOCAL3
-  #      Syslog::LOG_LOCAL3
-  #    when :local4, Syslog::LOG_LOCAL4
-  #      Syslog::LOG_LOCAL4
-  #    when :local5, Syslog::LOG_LOCAL5
-  #      Syslog::LOG_LOCAL5
-  #    when :local6, Syslog::LOG_LOCAL6
-  #      Syslog::LOG_LOCAL6
-  #    when :local7, Syslog::LOG_LOCAL7
-  #      Syslog::LOG_LOCAL7
-  #    else
-  #      raise "Unknown facility description #{facility.inspect}"
-  #    end
-  #  Syslog.reopen(@ident, Syslog::LOG_PID|Syslog::LOG_CONS, @facility)
-  #  facility
-  #end
-
-  def post_text(text)
-    Syslog.log(@level, "%s", text)
-  end
-
-  def close
-    Syslog.close
-    self
-  end
-end
-
-
-end
-end

data/test/event_test.rb

@@ -1,183 +0,0 @@
-require File.dirname(__FILE__)+'/test_helper'
-
-class EventTest < Test::Unit::TestCase
-  it 'keys' do
-    g = Fluent::Logger::TestLogger.new
-
-    assert_nothing_raised do
-      e1 = g.create_event('e1', :k1)
-      e1.k1('v1')
-    end
-
-    assert_raise(NoMethodError) do
-      e2 = g.create_event('e2')
-      e2.k1('v1')
-    end
-
-    assert_raise(NoMethodError) do
-      e3 = g.create_event('e3', :k1)
-      e3.k2('v2')
-    end
-  end
-
-  it 'set_value' do
-    g = Fluent::Logger::TestLogger.new
-
-    e1 = g.create_event('e1', :k1)
-    e1.k1('v1').post!
-    assert_equal g.queue.last, {:k1=>'v1'}
-
-    e2 = g.create_event('e2', :k1, :k2)
-    e2.k1('v1').k2('v2').post!
-    assert_equal g.queue.last, {:k1=>'v1', :k2=>'v2'}
-
-    e3 = g.create_event('e3', :k1, :k2)
-    e3.k1('v1').post!
-    assert_equal g.queue.last, {:k1=>'v1'}
-  end
-
-  it 'default_value' do
-    g = Fluent::Logger::TestLogger.new
-
-    e1 = g.create_event('e1', :k1)
-    e1.post!
-    assert_equal g.queue.last, {}
-
-    e2 = g.create_event('e2', :k1=>'v1')
-    e2.post!
-    assert_equal g.queue.last, {:k1=>'v1'}
-
-    e3 = g.create_event('e3', :k1=>'v1', :k2=>'v2')
-    e3.post!
-    assert_equal g.queue.last, {:k1=>'v1', :k2=>'v2'}
-
-    e4 = g.create_event('e4', :k1=>'v1', :k2=>'v2')
-    e4.k2('v3').post!
-    assert_equal g.queue.last, {:k1=>'v1', :k2=>'v3'}
-  end
-
-  it 'modify' do
-    g = Fluent::Logger::TestLogger.new
-
-    e1 = g.create_event('e1', :k1)
-    e1.k1!('v1')
-    e1.post!
-    assert_equal g.queue.last, {:k1=>'v1'}
-
-    e1.k1!('v2')
-    e1.post!
-    assert_equal g.queue.last, {:k1=>'v2'}
-
-    e2 = g.create_event('e2', :k1=>'v1')
-    e2.k1!('v2')
-    e2.post!
-    assert_equal g.queue.last, {:k1=>'v2'}
-  end
-
-  it 'no_modify' do
-    g = Fluent::Logger::TestLogger.new
-
-    e1 = g.create_event('e1', :k1)
-    e1.k1('v1')
-    e1.post!
-    assert_equal g.queue.last, {}
-
-    e1.k1('v2')
-    e1.post!
-    assert_equal g.queue.last, {}
-
-    e2 = g.create_event('e1', :k1=>'v1')
-    e2.k1('v2')
-    e2.post!
-    assert_equal g.queue.last, {:k1=>'v1'}
-  end
-
-  it 'with_map' do
-    g = Fluent::Logger::TestLogger.new
-
-    e1 = g.create_event('e1')
-    e1.with(:k1=>'v1').post!
-    assert_equal g.queue.last, {:k1=>'v1'}
-
-    e2 = g.create_event('e2', :k1=>'v1')
-    e2.with(:k1=>'v2').post!
-    assert_equal g.queue.last, {:k1=>'v2'}
-
-    e3 = g.create_event('e3', :k1=>'v1')
-    e3.with(:k1=>'v2', :k2=>'v3').post!
-    assert_equal g.queue.last, {:k1=>'v2', :k2=>'v3'}
-  end
-
-  it 'with_map_modify' do
-    g = Fluent::Logger::TestLogger.new
-
-    e1 = g.create_event('e2', :k1)
-    e1.with!(:k1=>'v1')
-    e1.post!
-    assert_equal g.queue.last, {:k1=>'v1'}
-
-    e1.with!(:k1=>'v2')
-    e1.post!
-    assert_equal g.queue.last, {:k1=>'v2'}
-
-    e2 = g.create_event('e2')
-    e2.with!(:k1=>'v1', :k2=>'v2')
-    e2.post!
-    assert_equal g.queue.last, {:k1=>'v1', :k2=>'v2'}
-
-    e2.with!(:k1=>'v3')
-    e2.post!
-    assert_equal g.queue.last, {:k1=>'v3', :k2=>'v2'}
-  end
-
-  it 'with_event_keys' do
-    g = Fluent::Logger::TestLogger.new
-
-    assert_nothing_raised do
-      e1 = g.create_event('e1', :k1)
-      e2 = g.create_event('e2', :k2)
-      e3 = e1.with(e2)
-      e3.k1('v1').k2('v2')
-    end
-
-    assert_nothing_raised do
-      e1 = g.create_event('e1', :k1)
-      e2 = g.create_event('e2', :k1, :k2)
-      e3 = e1.with(e2)
-      e3.k1('v1').k2('v2')
-    end
-
-    assert_nothing_raised do
-      e1 = g.create_event('e1', :k1)
-      e2 = g.create_event('e2', :k2)
-      e1.with!(e2)
-      e1.k1('v1').k2('v2')
-    end
-
-    assert_raise(NoMethodError) do
-      e1 = g.create_event('e1', :k1)
-      e2 = g.create_event('e2', :k2)
-      e3 = e1.with(e2)
-      e1.k2('v1')
-    end
-
-    assert_raise(NoMethodError) do
-      e1 = g.create_event('e1', :k1)
-      e2 = g.create_event('e2', :k2)
-      e1.with!(e2)
-      e2.k1('v1')
-    end
-  end
-
-  it 'tag' do
-    g = Fluent::Logger::TestLogger.new
-
-    e1 = g.create_event('e1')
-    e1.post!
-    assert_equal g.queue.last.tag, 'e1'
-
-    e1.post!('e2')
-    assert_equal g.queue.last.tag, 'e2'
-  end
-end
-

data/test/instance_test.rb

@@ -1,34 +0,0 @@
-require File.dirname(__FILE__)+'/test_helper'
-
-class InstanceTest < Test::Unit::TestCase
-  it 'default' do
-    g1 = Fluent::Logger::TestLogger.open
-    assert_equal g1.object_id, Fluent::Logger.default.object_id
-
-    assert_equal false, g1.closed?
-
-    g2 = Fluent::Logger::TestLogger.open
-    assert_equal g2.object_id, Fluent::Logger.default.object_id
-
-    assert_equal true, g1.closed?
-
-    g3 = Fluent::Logger::TestLogger.new
-    assert_equal g2.object_id, Fluent::Logger.default.object_id
-
-    assert_equal false, g2.closed?
-    Fluent::Logger.close
-    assert_equal true, g2.closed?
-  end
-
-  it 'post' do
-    g1 = Fluent::Logger::TestLogger.new
-
-    g1.post :k1=>'v1'
-    assert_equal g1.queue.last, {:k1=>'v1'}
-
-    g2 = Fluent::Logger::TestLogger.open
-
-    Fluent::Logger.post :k2=>'v2'
-    assert_equal g2.queue.last, {:k2=>'v2'}
-  end
-end