fluent-plugin-td 0.10.22 → 0.10.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e4943818798256c0ec07e3db957ccd6edeb0de9
-  data.tar.gz: 50ca2274ebc97ad068189ca892fde5d7676d23af
+  metadata.gz: bea1cedfa710605a41e6621d3c1a5e735d30d41b
+  data.tar.gz: e674f3cc8a8f4ea2901b8232266bfe7cbbada432
 SHA512:
-  metadata.gz: 45e450f1c6f593bf2a16607d07ed3d378cdb1f29c3b5e4f8058a319ae814f385b40692151b8e6a26344307f257baf310240421fa536885a78a90725a2a7fa407
-  data.tar.gz: 97abcbc88c894038e0f137c689030dffcae5d4a680560f382fe24a77177cfd709d9cbd44893c3f330389bbd30ffe0e973b0f0210c92c97fc1b878d542e1e45cd
+  metadata.gz: 256e1e8db03e0e8271a55e4d138d40d0c2af9f94cd9712d357625fd62bc87becbad890ec01ec649a90cd0390e103275a426a1b853e1d40c1fd5637ae88ab9f58
+  data.tar.gz: 02fb8daa4050de87b6ca2f2e7d87d5c732e9c75040c3588e893bd93255ae509dfa2fb48ed9850479c549b4ef55e85c8aa139d228a8237c7d06003145c69204c7

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
- - 1.9.2
  - 1.9.3
  - 2.0.0
  - 2.1.0

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.10.23 - 2014/12/08
+
+  * Relax fluentd version restriction
+
+
 Release 0.10.22 - 2014/10/17
 
   * Remove :time key from a record

data/fluent-plugin-td.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency "fluentd", "~> 0.10.27"
+  gem.add_dependency "fluentd", [">= 0.10.27", "< 2"]
   gem.add_dependency "td-client", "~> 0.8.66"
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "webmock", "~> 1.16"

data/lib/fluent/plugin/out_tdlog.rb

@@ -66,8 +66,11 @@ module Fluent
       define_method(:log) { $log }
     end
 
-    config_param :endpoint, :string, :default => TreasureData::API::NEW_DEFAULT_ENDPOINT
+    config_param :apikey, :string
+    config_param :auto_create_table, :bool, :default => true
 
+    config_param :endpoint, :string, :default => TreasureData::API::NEW_DEFAULT_ENDPOINT
+    config_param :use_ssl, :bool, :default => true
     config_param :connect_timeout, :integer, :default => nil
     config_param :read_timeout, :integer, :default => nil
     config_param :send_timeout, :integer, :default => nil
@@ -86,13 +89,10 @@ module Fluent
       require 'stringio'
       super
       @tmpdir = nil
-      @apikey = nil
       @key = nil
       @key_num_limit = 512  # TODO: Our one-time import has the restriction about the number of record keys.
       @record_size_limit = 32 * 1024 * 1024  # TODO
       @table_list = {}
-      @auto_create_table = true
-      @use_ssl = true
       @empty_gz_data = TreasureData::API.create_empty_gz_data
       @user_agent = "fluent-plugin-td: #{TreasureDataPlugin::VERSION}".freeze
     end
@@ -101,7 +101,7 @@ module Fluent
       super
 
       # overwrite default value of buffer_chunk_limit
-      if @buffer.respond_to?(:buffer_chunk_limit=) && !conf['buffer_chunk_limit']
+      if !conf['buffer_chunk_limit']
         @buffer.buffer_chunk_limit = IMPORT_SIZE_LIMIT
       end
 
@@ -110,33 +110,6 @@ module Fluent
         FileUtils.mkdir_p(@tmpdir)
       end
 
-      @apikey = conf['apikey']
-      unless @apikey
-        raise ConfigError, "'apikey' parameter is required on tdlog output"
-      end
-
-      if auto_create_table = conf['auto_create_table']
-        if auto_create_table.empty?
-          @auto_create_table = true
-        else
-          @auto_create_table = Config.bool_value(auto_create_table)
-          if @auto_create_table == nil
-            raise ConfigError, "'true' or 'false' is required for auto_create_table option on tdlog output"
-          end
-        end
-      end
-
-      if use_ssl = conf['use_ssl']
-        if use_ssl.empty?
-          @use_ssl = true
-        else
-          @use_ssl = Config.bool_value(use_ssl)
-          if @use_ssl == nil
-            raise ConfigError, "'true' or 'false' is required for use_ssl option on tdlog output"
-          end
-        end
-      end
-
       database = conf['database']
       table = conf['table']
       if database && table

data/lib/fluent/plugin/td_plugin_version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module TreasureDataPlugin
-    VERSION = '0.10.22'
+    VERSION = '0.10.23'
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-td
 version: !ruby/object:Gem::Version
-  version: 0.10.22
+  version: 0.10.23
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.27
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.27
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: td-client
   requirement: !ruby/object:Gem::Requirement