fileminer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 298242b9908865e27853c1085f4cdaeafeaa7f94fc001f35ebe66fabf1ef9627
-  data.tar.gz: d446249317bcd2b10d58b98825a67f1f27a71f3d393ef618f43f259f146701a2
+  metadata.gz: bc8657cdddb39cdeb63ba485063c29e8b743f1ab333b440b830eeb0b1ab40ffb
+  data.tar.gz: 429b76ea2aaa66be2b13d25314f3d85f68b0fdb6c8acea79d8dd6468ab357d92
 SHA512:
-  metadata.gz: c7535eaddaa3da7b7dad8350b04e3583bc93ff96e26cd3ed265319c4213d9aca4cb3016f8bf82070a96da21059d58c7912c89de608b918e7f42ff1d0a1f0ffa2
-  data.tar.gz: dbf77c43ff0ee9d79402837cf17a205b06268a6f9241dfa9171ea88a7b97fa699b2a750a23a68eb2b59210ffb08bcd4d73cc985646b491ee677e25faf8c4b394
+  metadata.gz: 941055a2163c105d3cd58aaeb0c6fdf83df66a2a11f7001ae7ef5639a4b0edbc62271335bdcf43283f03e198a8bd86e5a342ff10dfe626420fa254c23c630370
+  data.tar.gz: 3b684114ebd59fcd11684ec1b132a7e535d96df47e498fad0a9cc70ef1126687f51081cd922a19021fba60ab7ae283a95736c2416df9b87cc24f24c1405aaa81

data/lib/fileminer/output/mysql.rb

@@ -14,6 +14,7 @@ module Output
       ssl_mode: :disabled
     }
 
+    #
     # Create a mysql output plugin instance
     #
     # @param [Hash] options
@@ -36,20 +37,30 @@ module Output
       @encoding = conf[:encoding]
       conf[:ssl_mode] = :disabled if conf[:ssl_mode] != :enabled
       @mysql = Mysql2::Client.new conf
+      @mysql_conf = conf
       create_table_if_not_exists
       @sqls = Hash.new { |hash, key| hash[key] = generate_batch_sql key }
     end
 
     private
     def create_table_if_not_exists
-      rs = @mysql.query 'SHOW TABLES'
+      mysql_client = get_mysql_client
+      rs = mysql_client.query 'SHOW TABLES'
       tables = rs.map { |row| row.values[0] }
       unless tables.include? @table
         sql = create_table_sql
-        @mysql.query sql
+        mysql_client.query sql
       end
     end
 
+    def get_mysql_client
+      mysql_client = @mysql
+      if mysql_client.closed?
+        @mysql = mysql_client = Mysql2::Client.new @mysql_conf
+      end
+      mysql_client
+    end
+
     def create_table_sql
       <<-EOS
         CREATE TABLE `#@table` (
@@ -68,14 +79,7 @@ module Output
       "INSERT IGNORE INTO `#@table`(`host`,`path`,`pos`,`end`,`data`) VALUES " << (['(?,?,?,?,?)'] * size).join(',')
     end
 
-    def get_batch_sql(size)
-      if @sqls.key? size
-        @sqls[size]
-      else
-        @sqls[size] = generate_batch_sql size
-      end
-    end
-
+    #
     # Send all lines to mysql
     #
     # @param [Array] lines
@@ -83,18 +87,12 @@ module Output
     public
     def send_all(lines, &listener)
       values = lines.flat_map { |line| [line[:host], line[:path], line[:pos], line[:end], line[:data]] }
-      sql = get_batch_sql lines.size
-      @mysql.query 'BEGIN'
-      begin
-        stat = @mysql.prepare sql
-        stat.execute *values
-        stat.close
-        @mysql.query 'COMMIT'
-        listener.call
-      rescue => err
-        @mysql.query 'ROLLBACK'
-        raise err
-      end
+      sql = @sqls[lines.size]
+      mysql_client = get_mysql_client
+      stmt = @mysql_client.prepare sql
+      stmt.execute *values
+      stmt.close
+      listener.call
     end
 
   end

data/lib/fileminer/version.rb

@@ -1,5 +1,5 @@
 class FileMiner
 
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fileminer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Fang MinJie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies: []
 description: A simple file/log transfer tool coding by ruby.
 email:
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A simple file/log transfer tool coding by ruby.