fluent-plugin-pgjson 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dfa8ba1bbd21e1ffa84476064f2cb0eced7e5c8
-  data.tar.gz: 7522f3e3b4639c1022f58f41ee9b568fea58827a
+  metadata.gz: 0e7286deb5f6a025925e67fff494cc474102a1ac
+  data.tar.gz: 19ce53e0b1bbddb272fda7a8c84d9154325c2d8f
 SHA512:
-  metadata.gz: d3ff0bb506bac3398d9f02e5c3023babc3a7534261de3e05cb0c06738c6cc586f1f94578c3fa9e4fba91468682d1cb7aca129fefff2fed23dea84543003862ab
-  data.tar.gz: d9acbeca7d5d942ec7f1454716e3b69750b25bdc83416253f86ca1c04e921774b58f968c0cedadee06ad82a2be11cb7951551d95523dd27f830e373f21b73490
+  metadata.gz: f552ed8b2c11ca76b23f83b37790a34f517669ff068f999fd0be65d48ce031bde5df21461e5715f52cab1f07b6ae523347efd0b52ff751cbf40039aa11dcf037
+  data.tar.gz: 3c8c692582082cdc8440c74428faa0eb6057c7fa8779937722cf980393398784b64d6dbf4db97ae01099437b760461a38cc2c77dae2214f386f26115bb4b38b6

data/README.md

@@ -27,6 +27,17 @@ CREATE TABLE fluentd (
     ,record Json
 );
 ```
+### JSONB?
+
+Yes! Just define a record column as JSONB type.
+
+```
+CREATE TABLE fluentd (
+    tag Text
+    ,time Timestamptz
+    ,record Jsonb
+);
+```
 
 ## Configuration
 
@@ -65,7 +76,6 @@ CREATE TABLE fluentd (
 
 ## Copyright
 
-<table>
-<tr><td>Copyright</td><td>Copyright (c) 2012,2013 OKUNO Akihiro</td></tr>
-<tr><td>License</td><td>Apache License, Version 4.0</td></tr>
-</table>
+* Copyright (c) 2014- OKUNO Akihiro
+* License
+    * Apache License, version 2.0

data/fluent-plugin-pgjson.gemspec

@@ -3,12 +3,13 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-pgjson"
-  s.version     = "0.0.6"
+  s.version     = "0.0.7"
   s.authors     = ["OKUNO Akihiro"]
   s.email       = ["choplin.choplin@gmail.com"]
   s.homepage    = "https://github.com/choplin/fluent-plugin-pgjson"
   s.summary     = %q{}
   s.description = %q{}
+  s.license  = "Apache-2.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/fluent/plugin/out_pgjson.rb

@@ -39,18 +39,20 @@ class PgJsonOutput < Fluent::BufferedOutput
 
   def write(chunk)
     init_connection
+    @conn.exec("COPY #{@table} (#{@tag_col}, #{@time_col}, #{@record_col}) FROM STDIN WITH DELIMITER E'\\x01'")
     begin
-      @conn.exec("COPY #{@table} (#{@tag_col}, #{@time_col}, #{@record_col}) FROM STDIN WITH DELIMITER E'\\x01'")
       chunk.msgpack_each do |tag, time, record|
         @conn.put_copy_data "#{tag}\x01#{Time.at(time).to_s}\x01#{record_value(record)}\n"
       end
+    rescue => err
+      errmsg = "%s while copy data: %s" % [ err.class.name, err.message ]
+      @conn.put_copy_end( errmsg )
+      @conn.get_result
+      raise
+    else
       @conn.put_copy_end
-    rescue
-      if ! @conn.nil?
-        @conn.close()
-        @conn = nil
-      end
-      raise "failed to send data to postgres: #$!"
+      res = @conn.get_result
+      raise res.result_error_message if res.result_status!=PG::PGRES_COMMAND_OK
     end
   end
 
@@ -61,7 +63,6 @@ class PgJsonOutput < Fluent::BufferedOutput
 
       begin
         @conn = PGconn.new(:dbname => @database, :host => @host, :port => @port, :sslmode => @sslmode, :user => @user, :password => @password)
-        @conn.setnonblocking(true)
       rescue
         if ! @conn.nil?
           @conn.close()

data/test/plugin/test_out.rb

@@ -85,6 +85,24 @@ class PgJsonOutputTest < Test::Unit::TestCase
     end
   end
 
+  def test_invalid_json
+    with_connection do |conn|
+      tag = 'test'
+      time = Time.parse("2014-12-26 07:58:37 UTC")
+
+      d = create_driver(CONFIG, tag)
+      instance = d.instance
+      def instance.record_value(record)
+        'invalid json'
+      end
+      d.emit('', time.to_i)
+
+      assert_raise RuntimeError do
+        d.run
+      end
+    end
+  end
+
 
   def ensure_connection
     conn = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-pgjson
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - OKUNO Akihiro
@@ -56,7 +56,8 @@ files:
 - test/helper.rb
 - test/plugin/test_out.rb
 homepage: https://github.com/choplin/fluent-plugin-pgjson
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []