fluent-plugin-redis 0.1.3 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/fluent-plugin-redis.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-redis"
-  s.version     = "0.1.3"
+  s.version     = "0.2.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Yuki Nishijima"]
   s.date        = %q{2011-09-30}
@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency %q<fluent>, ["~> 0.9.14"]
+  s.add_dependency %q<fluentd>, ["~> 0.10.0"]
   s.add_dependency %q<redis>, ["~> 2.2.2"]
 end

data/lib/fluent/plugin/out_redis.rb

@@ -1,6 +1,7 @@
 module Fluent
   class RedisOutput < BufferedOutput
     Fluent::Plugin.register_output('redis', self)
+    attr_reader :host, :port, :db_number, :redis
 
     def initialize
       super
@@ -12,11 +13,11 @@ module Fluent
       super
 
       @host = conf.has_key?('host') ? conf['host'] : 'localhost'
-      @port = conf.has_key?('port') ? conf['port'] : 6379
-      @db = conf.has_key?('db') ? conf['db'] : nil
+      @port = conf.has_key?('port') ? conf['port'].to_i : 6379
+      @db_number = conf.has_key?('db_number') ? conf['db_number'].to_i : nil
 
       if conf.has_key?('namespace')
-        $log.warn "Namespace option has been removed from fluent-plugin-radis 0.1.1. Please add or remove the namespace '#{conf['namespace']}' manually."
+        $log.warn "namespace option has been removed from fluent-plugin-redis 0.1.3. Please add or remove the namespace '#{conf['namespace']}' manually."
       end
     end
 
@@ -24,29 +25,24 @@ module Fluent
       super
 
       @redis = Redis.new(:host => @host, :port => @port,
-                         :thread_safe => true, :db => @db)
+                         :thread_safe => true, :db => @db_number)
     end
 
     def shutdown
       @redis.quit
     end
 
-    def format(tag, event)
-      # event.record[:identifier]=[tag,event.time].join(".")
-      # event.record.to_msgpack
-      identifier=[tag,event.time].join(".")
-      [ identifier, event.record ].to_msgpack
+    def format(tag, time, record)
+      identifier = [tag, time].join(".")
+      [identifier, record].to_msgpack
     end
 
     def write(chunk)
       @redis.pipelined {
         chunk.open { |io|
           begin
-            MessagePack::Unpacker.new(io).each { |record|
-              # identifier = record["identifier"].to_s
-              # record.delete("identifier")
-              # @redis.mapped_hmset identifier, record
-              @redis.mapped_hmset record[0], record[1]
+            MessagePack::Unpacker.new(io).each.each_with_index { |record, index|
+              @redis.mapped_hmset "#{record[0]}.#{index}", record[1]
             }
           rescue EOFError
             # EOFError always occured when reached end of chunk.

data/test/plugin/out_redis.rb

@@ -0,0 +1,39 @@
+require 'fluent/test'
+
+class FileOutputTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+
+    @d = create_driver %[
+      host localhost
+      port 6379
+      db_number 1
+    ]
+    @time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+  end
+
+  def create_driver(conf = CONFIG)
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::RedisOutput).configure(conf)
+  end
+
+  def test_configure
+    assert_equal 'localhost', @d.instance.host
+    assert_equal 6379, @d.instance.port
+    assert_equal 1, @d.instance.db_number
+  end
+
+  def test_format
+    @d.emit({"a"=>1}, @time)
+    @d.expect_format(["test.#{@time}", {"a"=>1}].to_msgpack)
+    @d.run
+  end
+
+  def test_write
+    @d.emit({"a"=>2}, @time)
+    @d.emit({"a"=>3}, @time)
+    @d.run
+
+    assert_equal "2", @d.instance.redis.hget("test.#{@time}.0", "a")
+    assert_equal "3", @d.instance.redis.hget("test.#{@time}.1", "a")
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: fluent-plugin-redis
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Yuki Nishijima
@@ -13,14 +13,14 @@ cert_chain: []
 date: 2011-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: fluent
+  name: fluentd
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.14
+        version: 0.10.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ files:
 - VERSION
 - fluent-plugin-redis.gemspec
 - lib/fluent/plugin/out_redis.rb
+- test/plugin/out_redis.rb
 homepage: http://github.com/yuki24/fluent-plugin-redis
 licenses: []