Merge pull request #4 from slk244/bugFix

Add dependency for mysql slow log query
vmware · Aug 7, 2019 · 0f6cfaa · 0f6cfaa
2 parents 18466c7 + ed28bf8
commit 0f6cfaa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/fluent-plugin-vmware-log-intelligence.gemspec b/fluent-plugin-vmware-log-intelligence.gemspec
@@ -39,6 +39,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "fluentd", ">= 0.14.20"
   s.add_dependency "http", ">= 0.9.8"
+  s.add_dependency "myslog", "~> 0.0"
+  s.add_dependency "fluent-plugin-mysqlslowquery", ">= 0.0.9"
   s.add_development_dependency "rake", ">= 0.9.2"
   s.add_development_dependency "bundler", ">= 1.3.4"
   s.add_development_dependency 'test-unit', '~> 3.1.0'

diff --git a/lib/fluent/plugin/out_vmware_log_intelligence.rb b/lib/fluent/plugin/out_vmware_log_intelligence.rb
@@ -102,7 +102,7 @@ def create_lint_event(record)
       end
       merged_records["text"] = log
 
-      if log.nil? || log == "\\n" || log.empty?
+      if log == "\\n"
         {}
       else
         merged_records

diff --git a/test/plugin/test_out_vmware_log_intelligence.rb b/test/plugin/test_out_vmware_log_intelligence.rb
@@ -118,12 +118,6 @@ def test_json_with_sperators
     verify_write(input, output)
   end
 
-  def test_json_with_empty_message
-    input = {"host" => "192.168.0.1", "properties" => {"type" => "windows"}, "log" => ""}
-    output = [{}]
-    verify_write(input, output)
-  end
-
   def verify_write(input, output)
     config = %[
      endpoint_url  http://localhost:9200/li