fluent-diagtool 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 459fd1aefd11e12f79ef9f12cd99e289412fc99c3711191508aa3b17af985a6d
-  data.tar.gz: 8ed32d7c995ec7a6afb9a618421eb49590f44db96ed10f4babb8440cb3fde271
+  metadata.gz: '08fde300371aa506f74a6b700b18840d9ccfa88059a5b2ddff78256e839c37be'
+  data.tar.gz: 890483b9fa25f5ee44454d0c8e527ecd7dab2f60e676b283fc64d433c48ac6eb
 SHA512:
-  metadata.gz: 97adbb75557f1c7c2cf0624e2c9f4aa8ac1631a91d1b30f269fa137223ee20855ceb5764d47cf32f3b01ec0b1e80d541b0ecb069c27d136e456809b935f91efe
-  data.tar.gz: e6bc2057366a4f864d7d081235f29bcc0ddbc118412695f52fc6516a642421e9d9770a5a1fd6c7fc2deb7f4cd90a1d3e8d90cb0bcec07e99fd8ef4dc41a90f8a
+  metadata.gz: 0e4563b5db53d26fe79dc2a1d7f4c425f63a28bc4ebba62c9005796a258d69b92f1ecac2b8e22f952ff9ea672f5e0e6ff10aeaab49b52773ab0cf295b21a13a9
+  data.tar.gz: 5e26af31e777513a58067262e6ea89cad0d7c07f29d3e1e5ceca816162dc089325502f6b5c4a68470be548340c0e9b312e75c0490b1e8346a05526c95b79cd72

data/lib/fluent/diagtool/collectutils.rb

@@ -205,7 +205,7 @@ module Diagtool
     
     def collect_ulimit()
       output = @outdir+'/ulimit_n.output'
-      stdout, stderr, status = Open3.capture3("ulimit -n")
+      stdout, stderr, status = Open3.capture3("sh -c 'ulimit -n'")
       File.open(output, 'w') do |f|
         f.puts(stdout)
       end

data/lib/fluent/diagtool/diagutils.rb

@@ -176,16 +176,20 @@ module Diagtool
         end
       end
 
-      diaglogger_info("[Collect] Collecting ulimit information...")
-      ulimit = c.collect_ulimit()
-      diaglogger_info("[Collect] ulimit information is stored in #{ulimit}")
+      if system("sh -c 'ulimit -n'")
+      	diaglogger_info("[Collect] Collecting ulimit information...")
+      	ulimit = c.collect_ulimit()
+      	diaglogger_info("[Collect] ulimit information is stored in #{ulimit}")
 
-      diaglogger_info("[Valid] Validating ulimit information...")
-      ret, rec, val = v.valid_ulimit(ulimit)
-      if ret == true
-        diaglogger_info("[Valid]    ulimit => #{val} is correct (recommendation is >#{rec})")
+      	diaglogger_info("[Valid] Validating ulimit information...")
+      	ret, rec, val = v.valid_ulimit(ulimit)
+      	if ret == true
+          diaglogger_info("[Valid]    ulimit => #{val} is correct (recommendation is >#{rec})")
+        else
+          diaglogger_warn("[Valid]    ulimit => #{val} is incorrect (recommendation is >#{rec})")
+        end
       else
-        diaglogger_warn("[Valid]    ulimit => #{val} is incorrect (recommendation is >#{rec})")
+        diaglogger_warn("[Collect] ulimit command does not exist. skip collectig ulimit")
       end
 
       if @conf[:mask] == 'yes'

data/lib/fluent/diagtool/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module Diagtool
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-diagtool
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - kubotat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fileutils