fluent-plugin-mssql22 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db112bed0df522b3fa7c7e7d04f8582ed49f0c22
-  data.tar.gz: 23f07c8c468f352fcdcd0f716d27b649b263f9b7
+  metadata.gz: 96b507a34fcc8dfb8d437cf909bafdb64f201d4e
+  data.tar.gz: 962bb9eddf8f8ef000186816797b745c2e6f69de
 SHA512:
-  metadata.gz: e5fa1e58c446d0f89df2cedb7d86c1c58f03fc470a03f315a85535918decb54f63c94a39431b0d33f92649c82fa9768869c36079c6e6e99b314184c7fffd1867
-  data.tar.gz: 1fe898f3ba4f9a8eba8159d7394fec02a88d8120eeeb6b6b7827a2922287c359343ddfc0fe84910adbb866e43fd3bdab7093e58df9ee227af4166e9c5f0e30a5
+  metadata.gz: f2a6a3f9dfdcb6cd15890148a62a6c54a0bf8e7183be2855049dc3389a865f3bcc1b13bc851d92f5eb82a33c35fa2f75733e73f988836108595c8184f88e933f
+  data.tar.gz: 554abc9c573fef2e1d591a51ec4b8bc40fe4439fa7f18b3f28f12458b25c5ca02fa3b96a5b4f19b4a0ef21de8b748a419b994285d1b560b20b6914542d1c303b

data/lib/fluent/plugin/out_mssql22.rb

@@ -11,14 +11,23 @@ class Mssql22Output < Fluent::BufferedOutput
   config_param :username, :string
   config_param :password, :string
   config_param :host, :string
-  config_param :port, :string
+  config_param :port, :integer
   config_param :database, :string
-  config_param :sql, :string
+  config_param :query, :string
+  config_param :poolsize, :integer, default: 10
+  config_param :timeout, :integer, default: 60
+  config_param :login_timeout, :integer, default: 10
+  config_param :session_options, :string, default: nil
 
   def configure(conf)
     super
-    @keys = @sql.scan(/\?\{(.*?)\}/).flatten
+    @keys = @query.scan(/\?\{(.*?)\}/).flatten
     @format_proc = Proc.new{|tag, time, record| @keys.map{|k| [k,record[k]]}.to_h}
+    
+    unless @session_options.nil? 
+      @session_sets = @session_options.split(';')
+    end
+
   end
 
   def format(tag, time, record)
@@ -27,20 +36,29 @@ class Mssql22Output < Fluent::BufferedOutput
 
   def client
     begin
-      pool = ConnectionPool.new(size: 100) {
-        TinyTds::Client.new(
+      pool = ConnectionPool.new(size: @poolsize) {
+        client = TinyTds::Client.new(
           username: @username,
           password: @password,
           host: @host,
           port: @port,
           database: @database,
-          appname: 'fluentd - tinytds',
-		  timeout: 60
+          appname: 'fluentd-tinytds',
+          timeout: @timeout,
+          login_timeout: @login_timeout
         )
+        
+        unless @session_sets.nil? 
+          @session_sets.each do |set|
+            client.execute(set).do
+          end
+        end
+ 
+        client
       }
 	  
-    rescue
-      raise Fluent::ConfigError, "Cannot open database, check user or password"
+    rescue Exception => e
+      raise Fluent::ConfigError, e.message
     end
 
     pool
@@ -55,37 +73,25 @@ class Mssql22Output < Fluent::BufferedOutput
     super
   end
 
-  def sql_bind(data)
-    sql = @sql
+  def query_bind(data)
+    query = @query
     data.map do |k,v|
-      sql = sql.gsub("?{#{k}}",v.to_s.gsub(/'/,"''"))
+      query = query.gsub("?{#{k}}",v.to_s.gsub(/'/,"''"))
       
     end
-    sql
+    query
   end
  
   def write(chunk)
     begin
-	  @cp.with { |c| c.execute('SELECT 1;').do }
-	rescue
+      @cp.with { |c| c.execute('select 1;').do }
+    rescue
       @cp = client
-    ensure
-      @cp.with do |c|
-        c.execute('SET ANSI_NULLS ON;').do
-        c.execute('SET ANSI_PADDING ON;').do
-        c.execute('SET ANSI_WARNINGS ON;').do
-        c.execute('SET ARITHABORT ON;').do
-        c.execute('SET CONCAT_NULL_YIELDS_NULL ON;').do
-        c.execute('SET NUMERIC_ROUNDABORT ON;').do
-        c.execute('SET QUOTED_IDENTIFIER ON;').do
-        c.execute('SET NUMERIC_ROUNDABORT OFF;').do
-	  end
     end
 
     chunk.msgpack_each do |tag, time, data|
-      #p sql_bind(data)
-      @cp.with {|c| c.execute( sql_bind(data) ).do}
+      @cp.with {|c| c.execute( query_bind(data) ).do}
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mssql22
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - zle0
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fluentd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.10
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement