fluent-plugin-memcached 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecd435b2a7544144b0d4491bf27dcdbde3983616
-  data.tar.gz: 7ba5ef4be3af483784dbe95a09215bb85a2cad36
+  metadata.gz: 04bdd171af2653d194e71653ef1cde7b3f5d8eac
+  data.tar.gz: 7bc7d5f2c588e61462fa79f27c8bdcb8ac478552
 SHA512:
-  metadata.gz: 1e45543bc50066e97449d032c5e40455471dda3c85fa4f3154e45ae25071f33a13548227282e5a916396568d28747a845cf124054d9edeb565146b57e8d2f5ec
-  data.tar.gz: 086c2879c5f2c9bcd366ed14c3483a7f8049a3985ff503a78fdf802d66feb6046b43ad55a985cf3c593fba2e499ce0dbd5d61f7578f237b4bf76b7eefe4f781b
+  metadata.gz: a52eb5e76a3feb31c8f6e9410c9ea3c1f463150a7ff2a8a3ce1e64d15746bfb05d65410575b4ef3bed7d7a08890ccfee1826b4b32a9db5f6aa7e934873b4568d
+  data.tar.gz: f4763100a95b54f8d2101f20862e0a5dc766aa5446f1b3d0e0a2dc8c1a49a07af2056dc19a68933a2432ea84783275f51829b377d7b749b9f287952415427e79

data/.travis.yml

@@ -1,10 +1,12 @@
 language: ruby
 
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.4
+  - 2.4.1
 
+before_install:
+  - gem update bundler
 services:
   - memcached

data/README.md

@@ -1,6 +1,7 @@
 # Fluent::Plugin::Memcached, a plugin for [Fluentd](http://www.fluentd.org)
 
 [![Build Status](https://travis-ci.org/innossh/fluent-plugin-memcached.svg?branch=master)](https://travis-ci.org/innossh/fluent-plugin-memcached)
+[![Gem Version](https://badge.fury.io/rb/fluent-plugin-memcached.svg)](https://badge.fury.io/rb/fluent-plugin-memcached)
 
 Send your logs to Memcached.
 

data/fluent-plugin-memcached.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-memcached"
-  gem.version       = "0.0.7"
+  gem.version       = "0.1.0"
   gem.authors       = ["innossh"]
   gem.email         = ["innossh@users.noreply.github.com"]
 
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "fluentd"
+  gem.add_runtime_dependency "fluentd", [">= 0.14.15", "< 2"]
   gem.add_runtime_dependency "dalli"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "test-unit"

data/lib/fluent/plugin/out_memcached.rb

@@ -1,4 +1,7 @@
-class Fluent::MemcachedOutput < Fluent::BufferedOutput
+require 'dalli'
+require 'fluent/plugin/output'
+
+class Fluent::Plugin::MemcachedOutput < Fluent::Plugin::Output
   Fluent::Plugin.register_output('memcached', self)
 
   config_param :host, :string, :default => 'localhost'
@@ -13,11 +16,6 @@ class Fluent::MemcachedOutput < Fluent::BufferedOutput
   attr_accessor :memcached
   attr_accessor :formatter
 
-  def initialize
-    super
-    require 'dalli'
-  end
-
   def configure(conf)
     super
     if @value_format == 'json' and @param_names.nil?
@@ -33,12 +31,21 @@ class Fluent::MemcachedOutput < Fluent::BufferedOutput
 
   def shutdown
     @memcached.close
+    super
   end
 
   def format(tag, time, record)
     [tag, time, record].to_msgpack
   end
 
+  def formatted_to_msgpack_binary?
+    true
+  end
+
+  def multi_workers_ready?
+    true
+  end
+
   def write(chunk)
     chunk.msgpack_each { |tag, time, record|
       key = @formatter.key(record)

data/test/plugin/test_out_memcached.rb

@@ -1,8 +1,12 @@
 require 'test/unit'
 require 'fluent/test'
+require 'fluent/test/helpers'
+require 'fluent/test/driver/output'
 require 'fluent/plugin/out_memcached'
 
 class MemcachedOutputTest < Test::Unit::TestCase
+  include Fluent::Test::Helpers
+
   def setup
     Fluent::Test.setup
   end
@@ -31,8 +35,8 @@ class MemcachedOutputTest < Test::Unit::TestCase
     value_separater |
   ]
 
-  def create_driver(conf = CONFIG, tag='test')
-    Fluent::Test::BufferedOutputTestDriver.new(Fluent::MemcachedOutput, tag).configure(conf)
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::MemcachedOutput).configure(conf)
   end
 
   def test_configure
@@ -75,19 +79,21 @@ class MemcachedOutputTest < Test::Unit::TestCase
     d = create_driver
     time = Time.parse('2011-01-02 13:14:15 UTC').to_i
     record = {'key' => 'key', 'param1' => 'value'}
-    d.emit(record, time)
-    d.expect_format(['test', time, record].to_msgpack)
-    d.run
+    d.run(default_tag: 'test') do
+      d.feed(time, record)
+    end
+    assert_equal [['test', time, record].to_msgpack], d.formatted
   end
 
   def test_write
     d = create_driver
-    time = Time.parse('2011-01-02 13:14:15 UTC').to_i
+    time = event_time('2011-01-02 13:14:15 UTC')
     record1 = {'key' => 'a', 'param1' => '1'}
     record2 = {'key' => 'b', 'param1' => '2', 'param2' => '3'}
-    d.emit(record1, time)
-    d.emit(record2, time)
-    d.run
+    d.run(default_tag: 'test') do
+      d.feed(time, record1)
+      d.feed(time, record2)
+    end
 
     assert_equal '1', d.instance.memcached.get('a')
     assert_equal '2 3', d.instance.memcached.get('b')
@@ -95,42 +101,51 @@ class MemcachedOutputTest < Test::Unit::TestCase
 
   def test_write_json
     d = create_driver(CONFIG_JSON)
-    time = Time.parse('2011-01-02 13:14:15 UTC').to_i
+    time = event_time('2011-01-02 13:14:15 UTC')
     record1 = {'key' => 'c', 'param1' => '4'}
     record2 = {'key' => 'd', 'param1' => '5', 'param2' => '6'}
     record1_value_json = {'param1' => '4', 'param2' => nil}.to_json
     record2_value_json = {'param1' => '5', 'param2' => '6'}.to_json
-    d.emit(record1, time)
-    d.emit(record2, time)
-    d.run
+    d.run(default_tag: 'test') do
+      d.feed(time, record1)
+      d.feed(time, record2)
+    end
 
     assert_equal record1_value_json, d.instance.memcached.get('c')
     assert_equal record2_value_json, d.instance.memcached.get('d')
   end
 
-  def test_write_increment
-    d = create_driver(CONFIG_INCREMENT)
-    time = Time.parse('2011-01-02 13:14:15 UTC').to_i
-    record1 = {'key' => 'count1', 'param1' => 1}
-    record2 = {'key' => 'count2', 'param1' => 2}
-    record3 = {'key' => 'count1', 'param1' => 3}
-    record4 = {'key' => 'count2', 'param1' => 4}
-    d.emit(record1, time)
-    d.emit(record2, time)
-    d.emit(record3, time)
-    d.emit(record4, time)
-    d.run
-
-    assert_equal (1 + 3), d.instance.memcached.get('count1').to_i
-    assert_equal (2 + 4), d.instance.memcached.get('count2').to_i
+  class IncrementTest < self
+    def teardown
+      @d.instance.memcached.flush_all
+    end
+
+    def test_write_increment
+      @d = create_driver(CONFIG_INCREMENT)
+      time = event_time('2011-01-02 13:14:15 UTC')
+      record1 = {'key' => 'count1', 'param1' => 1}
+      record2 = {'key' => 'count2', 'param1' => 2}
+      record3 = {'key' => 'count1', 'param1' => 3}
+      record4 = {'key' => 'count2', 'param1' => 4}
+      @d.run(default_tag: 'test') do
+        @d.feed(time, record1)
+        @d.feed(time, record2)
+        @d.feed(time, record3)
+        @d.feed(time, record4)
+      end
+
+      assert_equal (1 + 3), @d.instance.memcached.get('count1').to_i
+      assert_equal (2 + 4), @d.instance.memcached.get('count2').to_i
+    end
   end
 
   def test_write_to_mysql
     d = create_driver(CONFIG_MYSQL)
-    time = Time.parse('2011-01-02 13:14:15 UTC').to_i
+    time = event_time('2011-01-02 13:14:15 UTC')
     record = {'key' => time, 'metrics_name' => 'count', 'metrics_value' => '100'}
-    d.emit(record, time)
-    d.run
+    d.run(default_tag: 'test') do
+      d.feed(time, record)
+    end
 
     assert_equal 'count|100', d.instance.memcached.get(time)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-memcached
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - innossh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.15
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.15
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Memcached output plugin for Fluent