fluent-plugin-td 0.10.15 → 0.10.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e714d06604caed899f2c4e779a2992ea212fc56b
-  data.tar.gz: 7adba07608a2c16bd3ed66569f292e764849e546
+  metadata.gz: 313c5a37b90313d1a1e805285da719c35951184b
+  data.tar.gz: c0f9975f641434550a2d18a9374bb84fc117b37f
 SHA512:
-  metadata.gz: 5e4368592d9bf8c457d354de53cc066af26cdb79af2f83142a7a394dfadfd89ff6e85a2d9115af93400acebad958133552156c5518e4a90a1f4406f1e25c2c78
-  data.tar.gz: a5ae6d314cc1e75c33deffd37a483cae7a5ce5ec7f52fda474241fcd4e0aabbd613a3cacd0e0e00664b288904b623f386d0c939975a66ab285e48c6c9d5f7b40
+  metadata.gz: 912b12246d9650b39137bb1ebd098b45ef9d6ecb4460c8a4667bf1daaaa40ec58ee5a5479a5d7a580b709a5aa5ecfd4b258f5394fbf47b98d1fff709f5d839c0
+  data.tar.gz: 6d7ac160d26c13d97c49930cb8b9fd045f3a04bfac1a05066ff05877ecf12a82e5562b3a37c7da0acc3c39f6649bedc1b8aecdff984a2fd4df3d9b528b62179c

data/ChangeLog

@@ -1,3 +1,10 @@
+Release 0.10.16 - 2013/09/25
+
+  * Add connect_timeout / read_timeout / send_timeout parameters
+  * Create table when 'database' and 'table' are specified with 'auto_create_table true'
+  * Update td-client to v0.8.55
+
+
 Release 0.10.15 - 2013/07/26
 
   * Add user-agent header to upload request

data/VERSION

@@ -1 +1 @@
-0.10.15
+0.10.16

data/fluent-plugin-td.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency "fluentd", "~> 0.10.27"
-  gem.add_dependency "td-client", "~> 0.8.53"
+  gem.add_dependency "td-client", "~> 0.8.55"
   gem.add_development_dependency "rake", ">= 0.9.2"
 end

data/lib/fluent/plugin/out_tdlog.rb

@@ -60,6 +60,10 @@ class TreasureDataLogOutput < BufferedOutput
     end
   end
 
+  config_param :connect_timeout, :integer, :default => nil
+  config_param :read_timeout, :integer, :default => nil
+  config_param :send_timeout, :integer, :default => nil
+
   def initialize
     require 'fileutils'
     require 'tempfile'
@@ -123,24 +127,13 @@ class TreasureDataLogOutput < BufferedOutput
       end
     end
 
-    unless @auto_create_table
-      database = conf['database']
-      table = conf['table']
-
-      if !database || !table
-        raise ConfigError, "'database' and 'table' parameter are required on tdlog output"
-      end
-      begin
-        TreasureData::API.validate_database_name(database)
-      rescue
-        raise ConfigError, "Invalid database name #{database.inspect}: #{$!}: #{conf}"
-      end
-      begin
-        TreasureData::API.validate_table_name(table)
-      rescue
-        raise ConfigError, "Invalid table name #{table.inspect}: #{$!}: #{conf}"
-      end
+    database = conf['database']
+    table = conf['table']
+    if database && table
+      validate_database_and_table_name(database, table, conf)
       @key = "#{database}.#{table}"
+    else
+      raise ConfigError, "'database' and 'table' parameter are required on tdlog output without auto_create_table" unless @auto_create_table
     end
 
     @anonymizes = {}
@@ -171,9 +164,18 @@ class TreasureDataLogOutput < BufferedOutput
 
   def start
     super
-    @client = TreasureData::Client.new(@apikey, :ssl=>@use_ssl, :http_proxy=>@http_proxy, :user_agent=>@user_agent)
-    unless @auto_create_table
-      check_table_exists(@key)
+
+    @client = TreasureData::Client.new(@apikey, :ssl => @use_ssl, :http_proxy => @http_proxy, :user_agent => @user_agent,
+      :connect_timeout => @connect_timeout, :read_timeout => @read_timeout, :send_timeout => @send_timeout)
+    begin
+      check_table_exists(@key) if @key
+    rescue => e
+      if @auto_create_table
+        database, table = @key.split('.', 2)
+        ensure_database_and_table(database, table)
+      else
+        raise e
+      end
     end
   end
 
@@ -282,13 +284,7 @@ class TreasureDataLogOutput < BufferedOutput
         unless @auto_create_table
           raise $!
         end
-        $log.info "Creating table #{database}.#{table} on TreasureData"
-        begin
-          @client.create_log_table(database, table)
-        rescue TreasureData::NotFoundError
-          @client.create_database(database)
-          @client.create_log_table(database, table)
-        end
+        ensure_database_and_table(database, table)
         io.pos = 0
         retry
       end
@@ -325,6 +321,29 @@ class TreasureDataLogOutput < BufferedOutput
     }
     list
   end
+
+  def validate_database_and_table_name(database, table, conf)
+    begin
+      TreasureData::API.validate_database_name(database)
+    rescue => e
+      raise ConfigError, "Invalid database name #{database.inspect}: #{e}: #{conf}"
+    end
+    begin
+      TreasureData::API.validate_table_name(table)
+    rescue => e
+      raise ConfigError, "Invalid table name #{table.inspect}: #{e}: #{conf}"
+    end
+  end
+
+  def ensure_database_and_table(database, table)
+    $log.info "Creating table #{database}.#{table} on TreasureData"
+    begin
+      @client.create_log_table(database, table)
+    rescue TreasureData::NotFoundError
+      @client.create_database(database)
+      @client.create_log_table(database, table)
+    end
+  end
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-td
 version: !ruby/object:Gem::Version
-  version: 0.10.15
+  version: 0.10.16
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.53
+        version: 0.8.55
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.53
+        version: 0.8.55
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Treasure Data Big Data as a Service plugin for Fluentd