fileminer 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 721d984d3d2e8c905f0bf86d52b2d89fb0adbb70c651ddd7d48cac16720d3584
-  data.tar.gz: 12015a1aba0b44df10b4033ff476a4d7818d3db250e5bbbe9b0a9c4d1afc4c3b
+  metadata.gz: 40b0403c4675a8340fee70e155fd7e39ccc902144ca4ab1af03a08db4b8ef8d9
+  data.tar.gz: f344c468064be5e3a594befbb62a43e5937f4351029fa88a7fef3a0d6310ce87
 SHA512:
-  metadata.gz: b0c9305e8e2ca63f13812593cdd1d9697de6fd51d9e633a5249accd704dbbc487924e2a36b2d2ff40981d7a271d79325a2a607b4618d1b82ca56693d7f9dad7a
-  data.tar.gz: 017dddf1edc9b4859124504e05bb1d2ed46b6d52c9bec053e56b838e9ded56027d6cbeedd768578ebfa9249c6e716f2b872157f77ad0cf06073f95b471cb2510
+  metadata.gz: 9f72907fd4e74d2bbbd93130fd1762101c1aa757a44923067b47eb62a515d7e3a18e4452cd2eb4ad73cb66f36d06ca2b3bc6bb4fe0a04c6131ba2b29256d40fc
+  data.tar.gz: '022318a184a41042136a96d2691890ca3d78f4a3d12b2e9ea2ffe2774430d98861460e9e3a0fb0ae2a3e6f820791af24e39e7c7bc1bac2a53406fa5e74d82aed'

data/README.md

@@ -20,6 +20,9 @@ Done installing documentation for fileminer after 0 seconds
 $ _
 ```
 
+*Note: This tool now only support cruby.*
+
+
 2. setting up fileminer
 
 * generate configuration file

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.1.0'
+  VERSION = '1.1.1'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fileminer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 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.