genesis_collector 0.1.37 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca15da7c07b0645913ad2130c17de497adb68417
-  data.tar.gz: c55108b2bb2f6bbaa1abcc87f34ba254379c3cce
+  metadata.gz: 6ce03ac802920f9d1f795c7d10c709b0d8e827d4
+  data.tar.gz: 99b013aafd16152ec22166fc77db3f88d7200c4f
 SHA512:
-  metadata.gz: edf68752cf4410409e8d6ebc067621f0a11e74e0a38b0ef59c4c179697473759b2749bbeb9ddfde5c58150a7d04e44877318c9c2d93f1f91287eb263749be9f8
-  data.tar.gz: 908e0e74058165dfa17404240848f793d14759dc1ec34e5c5e00f1f474224b20f2d8bf2551da93568beaaec19d4ecb1260d2164a7c957ed40ce68c9b7d900c55
+  metadata.gz: 8c0b936e3906a7a048f9a97acf8d1938228f0097e5f00d1a5c94dc50bc3a890e73ad90a642232e9a3c903a2d58cd58dfbf7e7317a79282ea5c64318ef2a3be05
+  data.tar.gz: 0e05d3f2702559b057d5234be03328b49d2b87547dc7c0327daed8a1152b90af46feb3c31d29aab1df2180a4c680b14d65b2c1ceab4616cf09691d752a33f0f7

data/lib/genesis_collector/collector.rb

@@ -129,7 +129,7 @@ module GenesisCollector
 
     def shellout_with_timeout(command, timeout = 2)
       response = `timeout #{timeout} #{command}`
-      unless $CHILD_STATUS.success?
+      if $CHILD_STATUS.exitstatus == 124  # timeout exits 124 on timeout
         STDERR.puts "Call to #{command} timed out after #{timeout} seconds"
         return ''
       end

data/lib/genesis_collector/disks.rb

@@ -16,7 +16,7 @@ module GenesisCollector
         if d[:dev].start_with?("/dev/sd")
           d[:slot] = get_scsi_slot(d[:dev])
           d[:uuid] = disk_uuid(d[:dev])
-          d[:status] = "unhealthy" unless disk_healthy(d[:dev])
+          d[:status] = disk_healthy(d[:dev]) ? "healthy" : "unhealthy"
         end
       end
       @payload[:disks].delete_if { |d| d[:serial_number].nil? }
@@ -29,9 +29,8 @@ module GenesisCollector
     private
 
     def disk_healthy(disk)
-      short_tests = shellout_with_timeout("smartctl -H #{disk}", 5)
-
-      short_tests =~ /result: PASSED/
+      shellout_with_timeout("smartctl -H #{disk}", 5)
+      $CHILD_STATUS.success?
     rescue
       true
     end

data/lib/genesis_collector/version.rb

@@ -1,3 +1,3 @@
 module GenesisCollector
-  VERSION = '0.1.37'
+  VERSION = '0.1.38'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genesis_collector
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors:
 - David Radcliffe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler