fluent-plugin-mysqlslowquery 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d318a00b22def16ee99bc9de957d54e653d4f29
-  data.tar.gz: 1edb76161eff1c7d29a797018584bcc64e469377
+  metadata.gz: 044d50ef2afc18bf5183a4c8d67c5fcd72881b26
+  data.tar.gz: 02519595c8efc5e11fe6aa4e19989721a88d14a5
 SHA512:
-  metadata.gz: 4e5b1c4cc2bc7d76264baccd6f58625d6c26a85a33662fa335806fcb6208ef9877c45bf2613dc334fa2639f9376540944730bf78322b4d08d828470a548ccef6
-  data.tar.gz: 34ee5a283e41663a2f4a2eb988577e1eaf83d13acf6933bab895074068ac454490dfb2701058fa66620e5434411c019dd0a365640bfe02c485a11f1d968fb451
+  metadata.gz: 8d47dce64e48586879402fa656af42fb15a193e2e4c6f8f7b42f05ca0d0e502da2854f1f1c8095c4104595b2a9308d3afe3732c7f2b7d917107cd4271305154a
+  data.tar.gz: 4467a2346c065fa27f9fd11a6cb338c3832b7290081a579615d5c4e3b329df1a6131236ec12f67f301d17a2ef284161ec6b90534d34d5cbd5e995886a2e42876

data/fluent-plugin-mysqlslowquery.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-mysqlslowquery"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.4"
+  gem.version       = "0.0.5"
   gem.add_development_dependency "fluentd"
   gem.add_development_dependency "myslog"
   gem.add_runtime_dependency "fluentd"

data/lib/fluent/plugin/in_mysql_slow_query.rb

@@ -21,11 +21,18 @@ class MySQLSlowQueryInput < TailInput
   Plugin.register_input('mysql_slow_query', self)
 
   def configure_parser(conf)
-    @last_db = File.open(@path).grep(/^use /).last.match(/^use ([^;]+)/)[1]
-    raise Fluent::ConfigError, "use clause could not be located in #{@path}" if @last_db.nil? || @last_db.empty?
     @parser = MySlog.new
   end
 
+  def search_last_use_database
+    last_use_query = File.open(@path).grep(/^use /).last
+    if last_use_query
+      last_use_database = last_use_query.match(/^use ([^;]+)/)
+      @last_use_database = last_use_database[1] if last_use_database
+      return @last_use_database
+    end
+  end
+
   def receive_lines(lines)
     es = MultiEventStream.new
     @parser.divide(lines).each do |record|
@@ -36,7 +43,11 @@ class MySQLSlowQueryInput < TailInput
         else
           time = Time.now.to_i
         end
-        record[:db] = @last_db if record[:db].nil? || record[:db].empty?
+
+        if record[:db].nil? || record[:db].empty?
+          record[:db] = @last_use_database ? @last_use_database : search_last_use_database()
+        end
+
         es.add(time, record)
       rescue
         $log.warn record, :error=>$!.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysqlslowquery
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - taka84u9
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd