fluent-plugin-dstat 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dbc37ebe465f4c0ae08e6c2f54af6c9e5717d0e
-  data.tar.gz: 1c24595a4c2d5680dca8523fdbe01e798f2e5508
+  metadata.gz: da7754b1412274c5b20c0fdd8090f141e45ee5c4
+  data.tar.gz: a1fdcaaa0583d70f1c4aaca6ba6f9538aadda82d
 SHA512:
-  metadata.gz: 1f56f8c4b7317d97d267c5bbe111f210eddf8b2756a715fd5e0f6edd7c4148c082ec74e82bc2d249c1b54b32d4b9c6db1b94e1257bab1d7259d595386356e285
-  data.tar.gz: 55a7d544584cc6d0c07f7e7ef286185da7adc3fb8aa1bdc1f9deef0e0f626fa36128e00e11b3c7bc8abb206b477f2951a478ad97097040104f1479bad284c5f8
+  metadata.gz: 7bee0b4b8a2139f84eceff5d3941529db3ca17e2330d10b013efb30692c0646528f98e0f8dedf02005cdad6ad50a9c4d20b7c0cdd396bf5fdd16f29e8fc7d026
+  data.tar.gz: df21f44396dd13cce329b12e0437e8dd1653c8808223a163d1c731da8b7505436bd31db71179c439936195c1ffa0f1cd1294487e60ab0cbe3dd741b32e75b21e

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/fluent-plugin-dstat.gemspec

@@ -3,13 +3,14 @@
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-dstat"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Shunsuke Mikami"]
   s.date = "2015-08-15"
   s.email = "shun0102@gmail.com"
+  s.license = "Apache-2.0"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -55,4 +56,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0"])
   end
 end
-

data/lib/fluent/plugin/in_dstat.rb

@@ -1,3 +1,4 @@
+require 'fluent/input'
 require 'fluent/mixin/rewrite_tag_name'
 
 module Fluent
@@ -17,11 +18,25 @@ module Fluent
       @last_time = Time.now
     end
 
+    # For fluentd v0.12.16 or earlier
+    class << self
+      unless method_defined?(:desc)
+        def desc(description)
+        end
+      end
+    end
+
+    desc "supported ${hostname} placeholder powered by Fluent::Mixin::RewriteTagName"
     config_param :tag, :string
+    desc "dstat command path"
     config_param :dstat_path, :string, :default => "dstat"
+    desc "dstat command line option"
     config_param :option, :string, :default => "-fcdnm"
+    desc "Run dstat command every `delay` seconds"
     config_param :delay, :integer, :default => 1
+    desc "Write dstat result to this file"
     config_param :tmp_file, :string, :default => "/tmp/dstat.csv"
+    desc "hostname command path"
     config_param :hostname_command, :string, :default => "hostname"
 
     include Fluent::Mixin::RewriteTagName
@@ -70,7 +85,12 @@ module Fluent
 
     def restart
       Process.detach(@pid)
-      Process.kill(:TERM, @pid)
+      begin
+        Process.kill(:TERM, @pid)
+      rescue Errno::ESRCH => e
+        $log.error "unexpected death of a child process", :error=>e.to_s
+        $log.error_backtrace
+      end
       @dw.detach
       @tw.detach
       @line_number = 0

data/test/plugin/test_in_dstat.rb

@@ -28,13 +28,17 @@ class DstatInputTest < Test::Unit::TestCase
     assert_equal 1, d.instance.delay
   end
 
-  def test_emit
-
+  data do
+    hash = {}
     OPTIONS.each do |op|
-      conf = "tag dstat\n option --#{op}\n delay 1"
-      emit_with_conf(conf)
+      hash[op] = op
     end
-
+    hash
+  end
+  def test_emit(data)
+    op = data
+    conf = "tag dstat\n option --#{op}\n delay 1"
+    emit_with_conf(conf)
   end
 
   def emit_with_conf(conf)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dstat
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Shunsuke Mikami
@@ -106,7 +106,8 @@ files:
 - test/helper.rb
 - test/plugin/test_in_dstat.rb
 homepage: http://github.com/shun0102/fluent-plugin-dstat
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Dstat Input plugin for Fluent event collector