fluent-plugin-cratedb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 827ea567aeac08e5e0f453e1fa72b5fd0b168f69
-  data.tar.gz: 2dc49370a61a21f3d22a353b0112472928ffd0dc
+  metadata.gz: 8375ba0031de25584763d5d0570092791e4726e7
+  data.tar.gz: 25b6416e2f18b794649329527312be541948d5e6
 SHA512:
-  metadata.gz: 85ee563ce046878641a8687b231d5b926d63be76da312ee78e1b1c7284799759f84f5dc0cf055830bdeb9cb728d30863efac6430e43ef264f1fbe8955afc406a
-  data.tar.gz: 252fe5d3c55e43714472d448c4265dead1dbac9c510316ba0152c241fde205d06aea13648a70835dddb022759937b74600b0f45aac5d2ed04832236905929bfb
+  metadata.gz: 5de3d87d662ad4b16f171ded89e2a5aff05a33d0052cd8ea456a3a9ff5116900622e7cacf502c070082bd40064f9abe4c2bcda1d4a8491b17da8c4592e6143e2
+  data.tar.gz: 6efb05e8eafce9a9aabc9a846f9858e7c19e788f127b035e399dd35dfc1cfa60c4a74b7dd118f7b459a5f57292931b24e8d7d38c8c1a730ea9626cb02aa75289

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/fluent-plugin-cratedb.gemspec

@@ -1,7 +1,6 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-#require 'fluent/plugin/cratedb/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-cratedb"
@@ -19,9 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.1'
+
   spec.add_dependency "crate_ruby", "~> 0.0.8"
   spec.add_runtime_dependency "fluentd", "~> 0.12.0"
 
   spec.add_development_dependency "rake", "~> 10.0"
-  #spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest"
 end

data/lib/fluent/plugin/out_cratedb.rb

@@ -1,13 +1,13 @@
 require 'crate_ruby'
-require 'digest'
 require 'fluent/output'
 
-
 module Fluent
   class Fluent::CratedbOutput < Fluent::BufferedOutput
     Fluent::Plugin.register_output('cratedb', self)
 
     include Fluent::SetTimeKeyMixin
+    include Fluent::SetTagKeyMixin
+    include Fluent::HandleTagNameMixin
 
     config_param :host, :string, :default => 'localhost', :desc => "CrateDB host."
     config_param :port, :integer, :default => 4200, :desc => "CrateDB port."
@@ -37,9 +37,13 @@ module Fluent
 
     def start
       super
-      require 'logger'
-      opts = {:http_options => @http_options, :logger => Logger.new(STDERR)}
-      @client = CrateClient.new(@servers, opts)
+      opts = {:http_options => @http_options, :logger => log}
+      begin
+        @client = CrateClient.new(@servers, opts)
+        log.info "CrateDB connection confirmed: #{@servers.join(", ")}"
+      rescue => e
+        raise e
+      end
     end
 
     def shutdown
@@ -57,11 +61,7 @@ module Fluent
         values << data
       end
       sql = "INSERT INTO #{@table} (#{@column_names.join(',')}) VALUES (#{ @column_names.map { |key| '?' }.join(',') })"
-      #log.info(sql)
       @client.execute(sql, nil, values, @http_options)
-
-      #digest = Digest::SHA1.hexdigest(data)
-      #@client.blob_put(table_name, digest, data)
     end
 
 
@@ -93,14 +93,14 @@ module Fluent
     # @param [Hash] Net::HTTP options (open_timeout, read_timeout)
     # @return [ResultSet]
     def execute(sql, args = nil, bulk_args = nil, http_options = {})
-      #@logger.debug sql
+      @logger.debug sql
       req = Net::HTTP::Post.new("/_sql", initheader = {'Content-Type' => 'application/json'})
       body = {"stmt" => sql}
       body.merge!({'args' => args}) if args
       body.merge!({'bulk_args' => bulk_args}) if bulk_args
       req.body = body.to_json
       response = request(req, http_options)
-      #@logger.debug response.body
+      @logger.debug response.body
       success = case response.code
                   when /^2\d{2}/
                     ResultSet.new response.body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cratedb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - buom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crate_ruby
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fluent Output Plugin for CrateDB (http://crate.io)
 email:
 - me@buom.io
@@ -80,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="