fluent-plugin-redis 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 772672c27bf0f6509a2929ab120c75f95796e62d
-  data.tar.gz: d9438be5e6fee77d90e296fd3f68c3cf108b6e01
+  metadata.gz: fc6961a6fa218ce3d3f85c2a26edba0cb83080f7
+  data.tar.gz: de3f5f6a4c21b6b81cd1a3f3dd1f5c91ac2ee2e0
 SHA512:
-  metadata.gz: a7c8f61082e5b520f01e583e22cc0f6e7b40ba480924ec2017b11e1320dfb0e781f5a27728c6eef51d93836e37ab8098d479f55168ac21f8a0bc5955cab09e16
-  data.tar.gz: d938a143d5ce6954c671bf666360aa1ce6c354438753b823bb6ce8940e73d166d051a578f231a04405e93f70518bdaa375e3a1700ac4fadb07a7c7a8a3845b8c
+  metadata.gz: ceef0bf6b9f63cc7910fb2f8c0ac420ff079fdd98313b5c1aad2d84fa5de75d38a51ce482b402ab693fb1f8f268ee77860e5730bc7a0868af1ad0122de6120ae
+  data.tar.gz: a7a186abedc53853bfaf5dc0526ddd0a906d69ef274a035c1dc8307761f410c30de7e1a8a36ef79005feb72269850ab8851cb9472274beea5e19c5a294b5b7f8

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 0.3.1
 
-* Use public msgpack related API instead of internal its API
+* Use public msgpack APIs instead of its internal APIs
 * Remove needless rescue block
 
 ## 0.3.0

data/{README.rdoc → README.md}

@@ -1,18 +1,18 @@
-= Redis output plugin for Fluent
+# Redis output plugin for Fluent
 
 fluent-plugin-redis is a fluent plugin to output to redis.
 
-== Requirements
+## Requirements
 
-    |fluent-plugin-redis|     fluentd      |  ruby  |
-    |-------------------|------------------|--------|
-    |     >= 0.3.0      | >= 0.14.8        | >= 2.1 |
-    |     == 0.2.3      | ~> 0.12.0 *      | >= 1.9 |
-    |      < 0.2.3      | >= 0.10.0, < 2 * | >= 1.9 |
+|fluent-plugin-redis|     fluentd      |  ruby  |
+|-------------------|------------------|--------|
+|     >= 0.3.0      | >= 0.14.8        | >= 2.1 |
+|     == 0.2.3      | ~> 0.12.0 *      | >= 1.9 |
+|      < 0.2.3      | >= 0.10.0, < 2 * | >= 1.9 |
 
-    * May not support all future fluentd features
+* May not support all future fluentd features
 
-== Installation
+## Installation
 
 What you have to do is only installing like this:
 
@@ -20,7 +20,7 @@ What you have to do is only installing like this:
 
 Then fluent automatically loads the plugin installed.
 
-== Configuration
+## Configuration
 
     <match redis.**>
       @type redis
@@ -40,16 +40,17 @@ Then fluent automatically loads the plugin installed.
       # strftime_format "%s"
       # Allow insert key duplicate. It will work as update values.
       # allow_duplicate_key true
+      # ttl 300 # If 0 or negative value is set, ttl is not set in each key.
     </match>
 
 
-=== Notice
+### Notice
 
 <em>insert_key_prefix</em>, <em>strftime_format</em>, and <em>allow_duplicate_key</em> are newly added config parameters.
 
 They can use v0.3.0 or later. To use this parameters, users must update Fluentd to v0.14 or later and this plugin to v0.3.0 or later.
 
-== Contributing to fluent-plugin-redis
+## Contributing to fluent-plugin-redis
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
@@ -59,8 +60,10 @@ They can use v0.3.0 or later. To use this parameters, users must update Fluentd
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
+## Copyright
 
-== Copyright
+Copyright (c) 2011- Yuki Nishijima
 
-Copyright:: Copyright (c) 2011- Yuki Nishijima
-License::   Apache License, Version 2.0
+## License
+
+Apache License, Version 2.0

data/fluent-plugin-redis.gemspec

@@ -3,10 +3,10 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-redis"
-  s.version     = "0.3.1"
+  s.version     = "0.3.2"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Yuki Nishijima", "Hiroshi Hatake", "Kenji Okimoto"]
-  s.date        = %q{2017-01-05}
+  s.date        = %q{2017-03-27}
   s.email       = ["mail@yukinishijima.net", "fluent@clear-code.com"]
   s.homepage    = "https://github.com/fluent-plugins-nursery/fluent-plugin-redis"
   s.summary     = "Redis output plugin for Fluent"

data/lib/fluent/plugin/out_redis.rb

@@ -9,6 +9,7 @@ module Fluent::Plugin
     helpers :compat_parameters, :inject
 
     DEFAULT_BUFFER_TYPE = "memory"
+    DEFAULT_TTL_VALUE = -1
 
     attr_reader :redis
 
@@ -19,6 +20,7 @@ module Fluent::Plugin
     config_param :insert_key_prefix, :string, default: "${tag}"
     config_param :strftime_format, :string, default: "%s"
     config_param :allow_duplicate_key, :bool, default: false
+    config_param :ttl, :integer, default: DEFAULT_TTL_VALUE
 
     config_section :buffer do
       config_set_default :@type, DEFAULT_BUFFER_TYPE
@@ -73,11 +75,17 @@ module Fluent::Plugin
           stream = chunk.to_msgpack_stream
           @unpacker.feed_each(stream).with_index { |record, index|
             identifier = [tag, time].join(".")
-            @redis.mapped_hmset "#{identifier}.#{index}", record[2]
+            @redis.multi do
+              @redis.mapped_hmset "#{identifier}.#{index}", record[2]
+              @redis.expire "#{identifier}.#{index}", @ttl if @ttl > 0
+            end
           }
         else
           chunk.each do |_tag, _time, record|
-            @redis.mapped_hmset "#{tag}", record
+            @redis.multi do
+              @redis.mapped_hmset "#{tag}", record
+              @redis.expire "#{tag}", @ttl if @ttl > 0
+            end
           end
         end
       }

data/test/plugin/test_out_redis.rb

@@ -36,6 +36,7 @@ class FileOutputTest < Test::Unit::TestCase
     assert_equal '${tag}', @d.instance.insert_key_prefix
     assert_equal '%s', @d.instance.strftime_format
     assert_false @d.instance.allow_duplicate_key
+    assert_equal Fluent::Plugin::RedisOutput::DEFAULT_TTL_VALUE, @d.instance.ttl
   end
 
   def test_configure_with_password
@@ -116,8 +117,25 @@ class FileOutputTest < Test::Unit::TestCase
         d.feed(time, {"a"=>3})
       end
 
-      assert_equal "2", d.instance.redis.hget("insert.test.#{time}.0", "a")
-      assert_equal "3", d.instance.redis.hget("insert.test.#{time}.1", "a")
+      assert_equal "2", d.instance.redis.hget("test.#{time}.0", "a")
+      assert_equal "3", d.instance.redis.hget("test.#{time}.1", "a")
+    end
+
+    def test_write_with_ttl
+      ttl = 2
+      d = create_driver CONFIG + %[
+        ttl #{ttl}
+        allow_duplicate_key true
+      ]
+      time = event_time("2011-01-02 13:14:00 UTC")
+      d.run(default_tag: 'ttl.insert.test') do
+        d.feed(time, {"a"=>2})
+      end
+
+      assert_in_delta 2.0, d.instance.redis.ttl("ttl.insert.test"), 1.0
+
+      sleep ttl+1
+      assert_equal -2, d.instance.redis.ttl("ttl.insert.test")
     end
 
     def test_write_with_custom_strftime_format

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-redis
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Yuki Nishijima
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -114,7 +114,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - fluent-plugin-redis.gemspec