lib/fluent/plugin/out_tdlog.rb in fluent-plugin-td-0.10.22 vs lib/fluent/plugin/out_tdlog.rb in fluent-plugin-td-0.10.23

@@ -64,12 +64,15 @@
     # To support log_level option since Fluentd v0.10.43
     unless method_defined?(:log)
       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
     config_set_default :buffer_type, 'file'
     config_set_default :flush_interval, 300
@@ -84,58 +87,28 @@
       require 'time' # Time#rfc2822
       require 'digest/md5'
       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
 
     def configure(conf)
       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
 
       if conf.has_key?('tmpdir')
         @tmpdir = conf['tmpdir']
         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