fluent-plugin-pghstore 0.1.1 → 0.1.2

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.1.1"
+  s.version     = "0.1.2"
   s.authors     = ["WAKAYAMA Shirou"]
   s.email       = ["shirou.faw@gmail.com"]
   s.homepage    = "https://github.com/shirou/fluent-plugin-pghstore"

data/lib/fluent/plugin/out_pghstore.rb

@@ -24,6 +24,9 @@ class Fluent::PgHStoreOutput < Fluent::BufferedOutput
   def shutdown
     super
 
+    if @conn != nil and @conn.finished?() == false
+      conn.close()
+    end
   end
   
   def format(tag, time, record)
@@ -32,20 +35,18 @@ class Fluent::PgHStoreOutput < Fluent::BufferedOutput
 
   def write(chunk)
     conn = get_connection()
-    if conn == nil
-      return
-    end
+    return if conn == nil  # TODO: chunk will be dropped. should retry?
 
     chunk.msgpack_each {|(tag, time_str, record)|
       sql = generate_sql(tag, time_str, record)
       begin
         conn.exec(sql)
       rescue PGError => e 
-        $log.error "PGError: " + e.message  # throw away
+        $log.error "PGError: " + e.message  # dropped if error
       end
-
     }
-    conn.close
+
+    conn.close()
   end
 
   private
@@ -68,17 +69,23 @@ SQL
   end
 
   def get_connection()
+    if @conn != nil and @conn.finished?() == false
+        return @conn  # connection is alived
+    end
+
     begin
       if @user
-        return PG.connect(:dbname => @database, :host => @host, :port => @port,
-                          :user => @user, :password => @password)
+        @conn = PG.connect(:dbname => @database, :host => @host, :port => @port,
+                           :user => @user, :password => @password)
       else
-        return PG.connect(:dbname => @database, :host => @host, :port => @port)
+        @conn = PG.connect(:dbname => @database, :host => @host, :port => @port)
       end
     rescue PGError => e 
       $log.error "Error: could not connect database:" + @database
       return nil
     end
+    return @conn
+
   end
 
   def table_exists?(table)
@@ -86,8 +93,9 @@ SQL
 SELECT COUNT(*) FROM pg_tables WHERE tablename = '#{table}';
 SQL
     conn = get_connection()
+    raise "Could not connect the database at startup. abort." if conn == nil
     res = conn.exec(sql)
-        conn.close
+    conn.close
     if res[0]["count"] == "1"
       return true
     else
@@ -107,10 +115,17 @@ SQL
     sql += @table_option if @table_option
 
     conn = get_connection()
-    conn.exec(sql)
+    raise "Could not connect the database at create_table. abort." if conn == nil
+
+    begin
+      conn.exec(sql) 
+    rescue PGError => e
+      $log.error "Error at create_table:" + e.message
+      $log.error "SQL:" + sql
+    end
     conn.close
 
-    $log.warn "#{tablename} table is not exists. created."
+    $log.warn "table #{tablename} was not exist. created it."
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-pghstore
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec