fluent-plugin-redshift 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c2ea0e593b59bd6c6f6dae6f6b95fe496ec059e
-  data.tar.gz: 3f7e925db5e64d32eaa446f0e969f32ce7137715
+  metadata.gz: 1ebf84db40572de4663f8108e16d5c197dff045f
+  data.tar.gz: 5d07205c804fe6f677a0ca4d153f3ecbc91db248
 SHA512:
-  metadata.gz: 20247b545d6a63ecb4ba6b773338ae77416c01c4e567bcdedeb69b0668da7560b24ab91a844c702aa37c2aa74477038d4c00818dd17cba6804ce91155f642ef8
-  data.tar.gz: 1a556e377f72c38430289154f98bf6f81da5737e7a09821153a9846fb5c67ad0878a5cce510513874d90b81dbfdee9370d2e3076be3ddc1f4dc53faf57633be1
+  metadata.gz: 6a016ea6bb6870fed38611be2447eee1d131dcbb23f7027acb29c023c1cc0194a928666a9c852d2049b9128dfb1a64bda8d7b05ba28854141a82ae333c387fed
+  data.tar.gz: 5fdf7097033677ec8bfcbd0b05154555992ba7c6315fb5f35da455608e918ecff175fd4c8e3349e89cb531d994eacf2095cd47e8fb1e3347fbd6354a31082de9

data/README.md

@@ -113,6 +113,8 @@ Example (watch and upload json formatted apache log):
 
 + `redshift_schemaname` : schema name to store data. By default, this option is not set and find table without schema as your own search_path.
 
++ `redshift_connect_timeout` : maximum time to wait for connection to succeed.
+
 + `file_type` : file format of the source data.  `csv`, `tsv`, `msgpack` or `json` are available.
 
 + `delimiter` : delimiter of the source data. This option will be ignored if `file_type` is specified.

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/fluent-plugin-redshift.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "fluentd", "~> 0.10.0"
   gem.add_dependency "aws-sdk", ">= 1.6.3"
-  gem.add_dependency "pg", "~> 0.14.0"
+  gem.add_dependency "pg", "~> 0.17.0"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "simplecov", ">= 0.5.4"
   gem.add_development_dependency "flexmock", ">= 1.3.1"

data/lib/fluent/plugin/out_redshift.rb

@@ -37,6 +37,7 @@ class RedshiftOutput < BufferedOutput
   config_param :redshift_schemaname, :string, :default => nil
   config_param :redshift_copy_base_options, :string , :default => "FILLRECORD ACCEPTANYDATE TRUNCATECOLUMNS"
   config_param :redshift_copy_options, :string , :default => nil
+  config_param :redshift_connect_timeout, :integer, :default => 10
   # file format
   config_param :file_type, :string, :default => nil  # json, tsv, csv, msgpack
   config_param :delimiter, :string, :default => nil
@@ -53,7 +54,8 @@ class RedshiftOutput < BufferedOutput
       port:@redshift_port,
       dbname:@redshift_dbname,
       user:@redshift_user,
-      password:@redshift_password
+      password:@redshift_password,
+      connect_timeout: @redshift_connect_timeout
     }
     @delimiter = determine_delimiter(@file_type) if @delimiter.nil? or @delimiter.empty?
     $log.debug format_log("redshift file_type:#{@file_type} delimiter:'#{@delimiter}'")
@@ -113,8 +115,8 @@ class RedshiftOutput < BufferedOutput
     # copy gz on s3 to redshift
     s3_uri = "s3://#{@s3_bucket}/#{s3path}"
     sql = @copy_sql_template % [s3_uri, @aws_sec_key]
-    $log.debug  format_log("start copying. s3_uri=#{s3_uri}")
-    conn = nil
+    $log.debug format_log("start copying. s3_uri=#{s3_uri}")
+
     begin
       conn = PG.connect(@db_conf)
       conn.exec(sql)
@@ -175,9 +177,9 @@ class RedshiftOutput < BufferedOutput
           gzw.write(tsv_text) if tsv_text and not tsv_text.empty?
         rescue => e
           if json?
-            $log.error format_log("failed to create table text from json. text=(#{record[@record_log_tag]})"), :error=>$!.to_s
+            $log.error format_log("failed to create table text from json. text=(#{record[@record_log_tag]})"), :error=>e.to_s
           else
-            $log.error format_log("failed to create table text from msgpack. text=(#{record[@record_log_tag]})"), :error=>$!.to_s
+            $log.error format_log("failed to create table text from msgpack. text=(#{record[@record_log_tag]})"), :error=>e.to_s
           end
 
           $log.error_backtrace
@@ -202,15 +204,15 @@ class RedshiftOutput < BufferedOutput
   end
 
   def fetch_table_columns
-    conn = PG.connect(@db_conf)
     begin
       columns = nil
+      conn = PG.connect(@db_conf)
       conn.exec(fetch_columns_sql_with_schema) do |result|
         columns = result.collect{|row| row['column_name']}
       end
       columns
     ensure
-      conn.close rescue nil
+      conn.close rescue nil if conn
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-redshift
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Masashi Miyazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement