fluent-plugin-pghstore 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3e04d208d0f647303315742d3a6b682334d143d
-  data.tar.gz: 6b0891e377cb9d1289479c4f4c247ebc7bad4438
+  metadata.gz: 8590eee6c44171264101a57265427a6c03312f9d
+  data.tar.gz: 1161a01eac5df5e0bf68526064a93c553cb5cf60
 SHA512:
-  metadata.gz: dca3130b73a82f1f2c23583641735af81bac2a4f3079a6f3c568062148a0d796d0732f1497f81694b2142f0c11cfdd0fc9aedd2deb56436602de2dd7417c2203
-  data.tar.gz: da3be89d0beff7901de981ac2983afe4134c34fc38f90cf48df4edbe9788c2d7737797614a901a191cd7e396a6367267984c18f4a696f964c2fc76dd1f11e076
+  metadata.gz: aa217601749dc071700f5c8698853c2f2bf17f9a7e45640c36c3184c757416711c23cbd7a911dd563a9f7c38f0eb0d664f1a254c79632194eede10dc09cd4953
+  data.tar.gz: 1ca9503e33c79b7aadc3565a82dcb3ae71c9d39aa705f449a8fca39c7671c9925087e522a67ef8d58569d7cbd533beee2c78eb6276b14571fdc13246297aebcd

data/fluent-plugin-pghstore.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-pghstore"
-  s.version     = "0.2.7"
+  s.version     = "0.2.8"
   s.authors     = ["WAKAYAMA Shirou"]
   s.email       = ["shirou.faw@gmail.com"]
   s.homepage    = "https://github.com/shirou/fluent-plugin-pghstore"
@@ -21,10 +21,9 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec", "~> 3.2.0"
   # s.add_runtime_dependency "rest-client"
-  s.add_development_dependency "fluentd", [">= 0.12.5", "< 2"]
   s.add_development_dependency "pg", "~> 0.18.1"
   s.add_development_dependency "rake", ">= 11.0"
   s.add_development_dependency "test-unit", "~> 3.1.0"
-#  s.add_runtime_dependency "fluentd", "~> 0.12.5"
+  s.add_runtime_dependency "fluentd", [">= 0.14.0", "< 2"]
 #  s.add_runtime_dependency "pg", "~> 0.18.1"
 end

data/lib/fluent/plugin/out_pghstore.rb

@@ -1,6 +1,13 @@
-class Fluent::PgHStoreOutput < Fluent::BufferedOutput
+require 'pg'
+require 'fluent/plugin/output'
+
+class Fluent::Plugin::PgHStoreOutput < Fluent::Plugin::Output
   Fluent::Plugin.register_output('pghstore', self)
 
+  helpers :compat_parameters
+
+  DEFAULT_BUFFER_TYPE = "memory"
+
   config_param :database, :string
   config_param :table, :string, :default => 'fluentd_store'
   config_param :host, :string, :default => 'localhost'
@@ -10,12 +17,22 @@ class Fluent::PgHStoreOutput < Fluent::BufferedOutput
 
   config_param :table_option, :string, :default => nil
 
+  config_section :buffer do
+    config_set_default :@type, DEFAULT_BUFFER_TYPE
+    config_set_default :chunk_keys, ['tag']
+  end
+
   def initialize
     super
-    require 'pg'
     @conn = nil
   end
 
+  def configure(conf)
+    compat_parameters_convert(conf, :buffer)
+    super
+    raise Fluent::ConfigError, "'tag' in chunk_keys is required." if not @chunk_key_tag
+  end
+
   def start
     super
 
@@ -31,19 +48,24 @@ class Fluent::PgHStoreOutput < Fluent::BufferedOutput
   end
 
   def format(tag, time, record)
-    [tag, time, record].to_msgpack
+    [time, record].to_msgpack
+  end
+
+  def formatted_to_msgpack_binary
+    true
   end
 
   def write(chunk)
     conn = get_connection()
     return if conn == nil  # TODO: chunk will be dropped. should retry?
 
-    chunk.msgpack_each {|(tag, time_str, record)|
+    tag = chunk.metadata.tag
+    chunk.msgpack_each {|(time_str, record)|
       sql = generate_sql(conn, tag, time_str, record)
       begin
         conn.exec(sql)
       rescue PGError => e
-        $log.error "PGError: " + e.message  # dropped if error
+        log.error "PGError: " + e.message  # dropped if error
       end
     }
 
@@ -94,7 +116,7 @@ SQL
         @conn = PG.connect(:dbname => @database, :host => @host, :port => @port)
       end
     rescue PGError => e
-      $log.error "Error: could not connect database:" + @database
+      log.error "Error: could not connect database:" + @database
       return nil
     end
 
@@ -128,12 +150,12 @@ SQL
     begin
       conn.exec(sql)
     rescue PGError => e
-      $log.error "Error at create_table:" + e.message
-      $log.error "SQL:" + sql
+      log.error "Error at create_table:" + e.message
+      log.error "SQL:" + sql
     end
     conn.close
 
-    $log.warn "table #{tablename} was not exist. created it."
+    log.warn "table #{tablename} was not exist. created it."
   end
 
 end

data/test/helper.rb

@@ -12,6 +12,8 @@ require 'test/unit'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'fluent/test'
+require 'fluent/test/driver/output'
+require 'fluent/test/helpers'
 unless ENV.has_key?('VERBOSE')
   nulllogger = Object.new
   nulllogger.instance_eval {|obj|

data/test/plugin/test_out_pghstore.rb

@@ -1,6 +1,8 @@
 require 'helper'
 
 class PGHStoreOutputTest < Test::Unit::TestCase
+  include Fluent::Test::Helpers
+
   def setup
     Fluent::Test.setup
   end
@@ -18,8 +20,8 @@ class PGHStoreOutputTest < Test::Unit::TestCase
     password #{PASSWORD}
   ]
 
-  def create_driver(conf = CONFIG, tag='test.input')
-    Fluent::Test::BufferedOutputTestDriver.new(Fluent::PgHStoreOutput, tag).configure(conf)
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::PgHStoreOutput).configure(conf)
   end
 
   def test_configure
@@ -36,24 +38,26 @@ class PGHStoreOutputTest < Test::Unit::TestCase
     d = create_driver
     with_connection(d) do |_conn|
 
-      time = Time.parse("2011-01-02 13:14:15 UTC").to_i
-      d.emit({"a"=>1}, time)
-      d.emit({"a"=>2}, time)
-
-      d.expect_format ['test.input', time, {"a"=>1}].to_msgpack
-      d.expect_format ['test.input', time, {"a"=>2}].to_msgpack
+      time = event_time("2011-01-02 13:14:15 UTC")
+      d.run(default_tag: "test.input") do
+        d.feed(time, {"a"=>1})
+        d.feed(time, {"a"=>2})
+      end
+      formatted = d.formatted
 
-      d.run
+      assert_equal [time, {"a"=>1}].to_msgpack, formatted[0]
+      assert_equal [time, {"a"=>2}].to_msgpack, formatted[1]
     end
   end
 
   def test_write
     d = create_driver
     with_connection(d) do |conn|
-      time = Time.parse("2011-01-02 13:14:15 UTC").to_i
-      d.emit({"a"=>1}, time)
-      d.emit({"a"=>2}, time)
-      d.run
+      time = event_time("2011-01-02 13:14:15 UTC")
+      d.run(default_tag: "test.input") do
+        d.feed(time, {"a"=>1})
+        d.feed(time, {"a"=>2})
+      end
 
       wait_data(conn)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-pghstore
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - WAKAYAMA Shirou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,26 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: fluentd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +66,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: fluentd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Output to PostgreSQL database which has a hstore extension
 email:
 - shirou.faw@gmail.com
@@ -124,11 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-pghstore
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Output to PostgreSQL database which has a hstore extension
-test_files:
-- test/helper.rb
-- test/plugin/test_out_pghstore.rb
-- test/plugin/test_out_pghstore.rb.bak
+test_files: []