fluent-plugin-kestrel 0.1.1 → 0.2.0

data/README.rdoc

@@ -16,11 +16,11 @@ see https://github.com/robey/kestrel
 
   <match kestrel.**>
     type kestrel
+    host localhost     # (required) kestrel host
+    queue test         # (required) queue name of kestrel
 
-    host localhost     # kestrel host (required)
-    queue test         # queue name of kestrel (required)
-
-    port 22133         # optional, default 22133
+    port 22133         # (optional) kestrel port. default 22133
+    ttl  100           # (optional) ttl(sec). default=0 (never expire)
   </match>
 
 == Data Format

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/fluent-plugin-kestrel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-kestrel"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Junichiro Takagi"]
-  s.date = "2012-05-20"
+  s.date = "2012-05-22"
   s.description = "fluentd output plugin for kestrel queue."
   s.email = "t.junichiro@gmail.com"
   s.extra_rdoc_files = [
@@ -24,8 +24,10 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "fluent-plugin-kestrel.gemspec",
+    "lib/fluent/plugin/in_kestrel.rb",
     "lib/fluent/plugin/out_kestrel.rb",
     "test/helper.rb",
+    "test/plugin/test_in_kestrel.rb",
     "test/plugin/test_out_kestrel.rb"
   ]
   s.homepage = "http://github.com/tjun/fluent-plugin-kestrel"

data/lib/fluent/plugin/in_kestrel.rb

@@ -0,0 +1,64 @@
+module Fluent
+  class KestrelInput < Input
+    Fluent::Plugin.register_input('kestrel', self)
+    attr_reader :kestrel
+
+    config_param :host,         :string,    :default => nil
+    config_param :port,         :integer,   :default => 22133
+    config_param :queue,        :string,    :default => nil
+    config_param :tag,          :string,    :default => nil
+
+    config_param :raw,          :bool,      :default => true
+    config_param :peek,         :bool,      :default => false
+    config_param :timeout,      :integer,   :default => 10
+
+    def initialize
+      super
+      require 'kestrel'
+      require 'time'
+    end
+
+    def configure(conf)
+      super
+
+      unless @queue && @host
+        raise ConfigError, "[kestrel config error]:'host' and 'queue' option is required."
+      end
+      unless @tag
+        raise ConfigError, "[kestrel config error]:'tag' option is required."
+      end
+      @timef = TimeFormatter.new(@time_format, @localtime)
+      @options = {
+        :raw => @raw,
+        :peek => @peek,
+        :timeout => @timeout
+      }.freeze
+    end
+
+    def start
+      super
+
+      @kestrel = Kestrel::Client.new(@host + ":" + @port.to_s)
+      @thread = Thread.new(&method(:run))
+    end
+
+    def shutdown
+      @thread.join
+      super
+    end
+
+    def run
+      loop do
+        data = @kestrel.get(@queue, @options)
+        unless data
+          sleep 1
+        else
+          Engine.emit(@tag, Engine.now, data)
+        end
+      end
+    rescue
+      $log.error "unexpected error.", :error=>$!.to_s
+      $log.error_backtrace
+    end
+  end
+end

data/lib/fluent/plugin/out_kestrel.rb

@@ -10,8 +10,6 @@ module Fluent
     config_param :raw,          :bool,      :default => true
     config_param :time_format,  :string,    :default => nil
 
-
-
     def initialize
       super
       require 'kestrel'
@@ -22,7 +20,7 @@ module Fluent
       super
 
       unless @queue && @host
-        raise ConfigError, "[kestrel config error]:'host' and 'queue' parameter must be specified."
+        raise ConfigError, "[kestrel config error]:'host' and 'queue' option is required."
       end
       @timef = TimeFormatter.new(@time_format, @localtime)
     end

data/test/helper.rb

@@ -1,22 +1,10 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
 require 'test/unit'
 require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'fluent/test'
-require 'fluent/plugin/out_kestrel'
-
-class Test::Unit::TestCase
-end
 
 if ENV['SIMPLE_COV']
     require 'simplecov'
@@ -25,3 +13,14 @@ if ENV['SIMPLE_COV']
       add_filter 'pkg/'
     end
 end
+
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
+class Test::Unit::TestCase
+end

data/test/plugin/test_in_kestrel.rb

@@ -0,0 +1,39 @@
+require 'helper'
+
+class TestFluentPluginInKestrel < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+    require 'fluent/plugin/in_kestrel'
+  end
+
+  CONFIG = %[
+    type kestrel
+    host localhost
+    port 22133
+    queue fluent-test
+    tag fluent.test
+  ]
+
+  def create_driver(conf = CONFIG)
+    Fluent::Test::InputTestDriver.new(Fluent::KestrelInput).configure(conf)
+  end
+
+  def test_configure
+    d = create_driver(%[
+      type kestrel
+      host localhost
+      port 22133
+      queue fluent-test
+      tag   fluent.test
+    ])
+
+    assert_equal 'localhost', d.instance.host
+    assert_equal 22133, d.instance.port
+    assert_equal "fluent-test", d.instance.queue
+    assert_equal "fluent.test", d.instance.tag
+  end
+
+ # def test_emit
+  # ToDo
+ # end
+end

data/test/plugin/test_out_kestrel.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestFluentPluginKestrel < Test::Unit::TestCase
+class TestFluentPluginOutKestrel < Test::Unit::TestCase
   def setup
     Fluent::Test.setup
     require 'fluent/plugin/out_kestrel'
@@ -28,7 +28,8 @@ class TestFluentPluginKestrel < Test::Unit::TestCase
     assert_equal 'localhost', d.instance.host
     assert_equal 22133, d.instance.port
     assert_equal "fluent-test", d.instance.queue
-
+    d.run
+    d.instance.kestrel.flush("fluent-test")
   end
 
   def test_format
@@ -54,6 +55,6 @@ class TestFluentPluginKestrel < Test::Unit::TestCase
     assert_equal "2011-01-02T13:14:15Z\ttest\t{\"a\":1}", d.instance.kestrel.get("fluent-test", opts=get_opt)
     assert_equal "2011-01-02T13:14:15Z\ttest\t{\"a\":2}", d.instance.kestrel.get("fluent-test", opts=get_opt)
     assert_equal "2011-01-02T13:14:15Z\ttest\t{\"a\":3}", d.instance.kestrel.get("fluent-test", opts=get_opt)
-
+    d.instance.kestrel.flush("fluent-test")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kestrel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kestrel-client
@@ -154,8 +154,10 @@ files:
 - Rakefile
 - VERSION
 - fluent-plugin-kestrel.gemspec
+- lib/fluent/plugin/in_kestrel.rb
 - lib/fluent/plugin/out_kestrel.rb
 - test/helper.rb
+- test/plugin/test_in_kestrel.rb
 - test/plugin/test_out_kestrel.rb
 homepage: http://github.com/tjun/fluent-plugin-kestrel
 licenses:
@@ -172,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3129241088669939202
+      hash: -1831959958403091659
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: