fluent-plugin-pghstore 0.1.0 → 0.1.1

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.0"
+  s.version     = "0.1.1"
   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

@@ -18,16 +18,12 @@ class Fluent::PgHStoreOutput < Fluent::BufferedOutput
   def start
     super
 
-    @conn = get_connection(@database, @host, @port, @user, @password)
-
     create_table(@table) unless table_exists?(@table)
-
   end
 
   def shutdown
     super
 
-    @conn.close
   end
   
   def format(tag, time, record)
@@ -35,14 +31,21 @@ class Fluent::PgHStoreOutput < Fluent::BufferedOutput
   end
 
   def write(chunk)
+    conn = get_connection()
+    if conn == nil
+      return
+    end
+
     chunk.msgpack_each {|(tag, time_str, record)|
       sql = generate_sql(tag, time_str, record)
       begin
-        @conn.exec(sql)
+        conn.exec(sql)
       rescue PGError => e 
         $log.error "PGError: " + e.message  # throw away
       end
+
     }
+    conn.close
   end
 
   private
@@ -64,12 +67,17 @@ SQL
     return sql
   end
 
-  def get_connection(dbname, host, port, user, password)
-    if user
-      return PG.connect(:dbname => dbname, :host => host, :port => port,
-                        :user => user, :password => password)
-    else
-      return PG.connect(:dbname => dbname, :host => host, :port => port)
+  def get_connection()
+    begin
+      if @user
+        return PG.connect(:dbname => @database, :host => @host, :port => @port,
+                          :user => @user, :password => @password)
+      else
+        return PG.connect(:dbname => @database, :host => @host, :port => @port)
+      end
+    rescue PGError => e 
+      $log.error "Error: could not connect database:" + @database
+      return nil
     end
   end
 
@@ -77,7 +85,9 @@ SQL
     sql =<<"SQL"
 SELECT COUNT(*) FROM pg_tables WHERE tablename = '#{table}';
 SQL
-    res = @conn.exec(sql)
+    conn = get_connection()
+    res = conn.exec(sql)
+        conn.close
     if res[0]["count"] == "1"
       return true
     else
@@ -96,7 +106,9 @@ SQL
 
     sql += @table_option if @table_option
 
-    @conn.exec(sql)
+    conn = get_connection()
+    conn.exec(sql)
+    conn.close
 
     $log.warn "#{tablename} table is not exists. created."
   end

metadata

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