fluent-logger 0.4.1 → 0.4.2

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
  - ree
  - jruby
 
-before_script:
-  - git submodule update -i
+before_install: git submodule update -i
 
 script: bundle exec rake spec

data/ChangeLog

@@ -1,4 +1,11 @@
 
+Release 0.4.2 - 2012/03/02
+
+  * Added TestLogger#tag_queue(tag_name)
+  * Added bin/fluent-post cli command
+  * Impl default LoggerBase#close
+  * Don't change logger.level if :debug=> option is sepcified
+
 Release 0.4.1 - 2011/11/07
 
   * added Logger#post_with_time(tag, map, time)

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/bin/fluent-post

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require 'fluent/logger/fluent_logger/cui'
+
+res = Fluent::Logger::FluentLogger::CUI.post(ARGV)
+if res[:success]
+  warn "post successed. #=> #{res[:data].inspect}"
+else
+  warn "post failed. #=> #{res[:data].inspect}"
+  exit 1
+end

data/lib/fluent/logger.rb

@@ -24,6 +24,7 @@ module Logger
   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
 

data/lib/fluent/logger/console_logger.rb

@@ -32,7 +32,7 @@ class ConsoleLogger < TextLogger
       @io = out
       @on_reopen = Proc.new { }
     else
-      raise "Invlaid output: #{out.inspect}"
+      raise "Invalid output: #{out.inspect}"
     end
   end
 

data/lib/fluent/logger/fluent_logger.rb

@@ -82,11 +82,15 @@ class FluentLogger < LoggerBase
 
     @limit = options[:buffer_limit] || BUFFER_LIMIT
 
-    @logger = options[:logger] || ::Logger.new(STDERR)
-    if options[:debug]
-      @logger.level = ::Logger::DEBUG
+    if logger = options[:logger]
+      @logger = logger
     else
-      @logger.level = ::Logger::INFO
+      @logger = ::Logger.new(STDERR)
+      if options[:debug]
+        @logger.level = ::Logger::DEBUG
+      else
+        @logger.level = ::Logger::INFO
+      end
     end
 
     begin

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

@@ -0,0 +1,46 @@
+
+require 'fluent/logger'
+require 'optparse'
+
+module Fluent
+module Logger
+class FluentLogger
+
+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]
+    })
+
+    {
+      :success => f.post(options[:tag], options[:data]),
+      :data    => options[:data]
+    }
+  end
+
+  extend self
+end
+
+end
+end
+end

data/lib/fluent/logger/logger_base.rb

@@ -30,8 +30,8 @@ class LoggerBase
   #def post_with_time(tag, map)
   #end
 
-  #def close(map)
-  #end
+  def close
+  end
 end
 
 end

data/lib/fluent/logger/test_logger.rb

@@ -39,6 +39,10 @@ class TestLogger < LoggerBase
     true
   end
 
+  def tag_queue(tag)
+    @queue.find_all {|map| map.tag == tag }
+  end
+
   def close
   end
 end

data/lib/fluent/logger/version.rb

@@ -1,7 +1,7 @@
 module Fluent
 module Logger
 
-VERSION = '0.4.1'
+VERSION = '0.4.2'
 
 end
 end

data/spec/fluent_logger_spec.rb

@@ -13,10 +13,13 @@ require 'tempfile'
 require 'logger'
 require 'socket'
 require 'stringio'
+require 'fluent/logger/fluent_logger/cui'
 
 $log = Fluent::Log.new(StringIO.new) # XXX should remove $log from fluentd 
 
 describe Fluent::Logger::FluentLogger do
+  WAIT = ENV['WAIT'] ? ENV['WAIT'].to_f : 0.1
+
   let(:fluentd_port) {
     port = 60001
     loop do
@@ -59,10 +62,13 @@ describe Fluent::Logger::FluentLogger do
     queue
   }
 
-    after(:each) do
-      output.emits.clear rescue nil
-    end
+  after(:each) do
+    output.emits.clear rescue nil
+  end
 
+  def wait_transfer
+    sleep WAIT
+  end
 
   context "running fluentd" do
     before(:each) do
@@ -83,21 +89,31 @@ EOF
       Fluent::Test.setup
       Fluent::Engine.read_config(tmp.path)
       @coolio_default_loop = nil
-      Thread.new {
+      @thread = Thread.new {
         @coolio_default_loop = Coolio::Loop.default
         Fluent::Engine.run
       }
-      sleep 0.001 # next tick
+      wait_transfer
     end
 
     after(:each) do
       @coolio_default_loop.stop
       Fluent::Engine.send :shutdown
+      @thread.join
+    end
+
+    context('Post by CUI') do
+      it('post') {
+        args = %W(-h localhost -p #{fluentd_port} -t logger-test.tag -v a=b -v foo=bar)
+        Fluent::Logger::FluentLogger::CUI.post(args)
+        queue.last.should == ['logger-test.tag', {'a' => 'b', 'foo' => 'bar'}]
+      }
     end
 
     context('post') do
       it ('success') { 
         logger.post('tag', {'a' => 'b'}).should be_true
+        wait_transfer
         queue.last.should == ['logger-test.tag', {'a' => 'b'}]
       }
 
@@ -108,13 +124,14 @@ EOF
 
         logger.post('tag', {'b' => 'c'})
         logger.should be_connect
+        wait_transfer
         queue.last.should == ['logger-test.tag', {'b' => 'c'}]
       }
 
       it ('large data') {
         data = {'a' => ('b' * 1000000)}
         logger.post('tag', data)
-        sleep 0.01 # wait write
+        wait_transfer
         queue.last.should == ['logger-test.tag', data]
       }
 
@@ -125,6 +142,7 @@ EOF
           'proc'   => proc { 1 },
         }
         logger.post('tag', data)
+        wait_transfer
         logger_data = queue.last.last
         logger_data['time'].should == '2008-09-01 10:05:00 UTC'
         logger_data['proc'].should be
@@ -139,6 +157,7 @@ EOF
           'NaN'    => (0.0/0.0) # JSON don't convert
         }
         logger.post('tag', data)
+        wait_transfer
         queue.last.should be_nil
         logger_io.rewind
         logger_io.read =~ /FluentLogger: Can't convert to msgpack:/
@@ -171,8 +190,9 @@ EOF
   
   context "not running fluentd" do
     context('fluent logger interface') do
-      it ('post & close') { 
+      it ('post & close') {
         logger.post('tag', {'a' => 'b'}).should be_false
+        wait_transfer  # even if wait
         queue.last.should be_nil
         logger.close
         logger_io.rewind
@@ -184,6 +204,7 @@ EOF
       it ('post limit over') do
         logger.limit = 100
         logger.post('tag', {'a' => 'b'})
+        wait_transfer  # even if wait
         queue.last.should be_nil
 
         logger_io.rewind

data/spec/logger_spec.rb

@@ -12,9 +12,8 @@ describe Fluent::Logger do
     end
 
     it('post') {
-      time = Time.now
-      test_logger.should_receive(:post).with('tag1', {:foo => :bar}, time)
-      Fluent::Logger.post('tag1', {:foo => :bar}, time)
+      test_logger.should_receive(:post).with('tag1', {:foo => :bar})
+      Fluent::Logger.post('tag1', {:foo => :bar})
     }
 
     it('close') {

data/spec/test_logger_spec.rb

@@ -16,6 +16,12 @@ describe Fluent::Logger::TestLogger do
       its(:last)  { should == {:foo => :baz } }
       its("first.tag") { should == "tag1" }
       its("last.tag")  { should == "tag2" }
+
+      it("tag_queue") {
+        logger.tag_queue('tag1').size.should == 1
+        logger.tag_queue('tag2').size.should == 1
+        logger.tag_queue('tag3').size.should == 0
+      }
     end
 
     context "max" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-logger
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00.000000000Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70207037595840 !ruby/object:Gem::Requirement
+  requirement: &2172185840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70207037595840
+  version_requirements: *2172185840
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70207037595300 !ruby/object:Gem::Requirement
+  requirement: &2172185340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70207037595300
+  version_requirements: *2172185340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70207037594800 !ruby/object:Gem::Requirement
+  requirement: &2172184880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70207037594800
+  version_requirements: *2172184880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70207037594340 !ruby/object:Gem::Requirement
+  requirement: &2172184420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70207037594340
+  version_requirements: *2172184420
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70207037593860 !ruby/object:Gem::Requirement
+  requirement: &2172183960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *70207037593860
+  version_requirements: *2172183960
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70207037593340 !ruby/object:Gem::Requirement
+  requirement: &2172183500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,11 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70207037593340
+  version_requirements: *2172183500
 description: fluent logger for ruby
 email: frsyuki@gmail.com
-executables: []
+executables:
+- fluent-post
 extensions: []
 extra_rdoc_files: []
 files:
@@ -94,11 +95,13 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/fluent-post
 - fluent-logger.gemspec
 - lib/fluent-logger.rb
 - lib/fluent/logger.rb
 - lib/fluent/logger/console_logger.rb
 - lib/fluent/logger/fluent_logger.rb
+- lib/fluent/logger/fluent_logger/cui.rb
 - lib/fluent/logger/logger_base.rb
 - lib/fluent/logger/null_logger.rb
 - lib/fluent/logger/test_logger.rb
@@ -124,21 +127,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3162457063244932466
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3162457063244932466
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: fluent logger for ruby