genesis_collector 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 794cf9b7336cdf2230c6a0dac7dabcd713728f1c
-  data.tar.gz: 66a0922e1a18e79edc407526ed96f8a5bc492ac8
+  metadata.gz: bd8f39a8d1af3d60b93b660d40ec8a2a892137e7
+  data.tar.gz: 29b7807e760154ddee6e6c9eb049054ba9e616cd
 SHA512:
-  metadata.gz: 636cc95d095a07df45cf6910d192c318f7628f96fa1f8f12a55ad4352e13dcb45cdeef8b02c1d65e8ee56391fde121a0f2a7401a9343ee1a6ec84dd4704e0f33
-  data.tar.gz: d5f2f0350ed6686157d390ebb012294500e2c2af2ad490e35c0b939b15a091d758836977de6d6f5e43620d6751ecaad33f87002eea25b02ce0a2730e84d9acc6
+  metadata.gz: e93499cfc55c3f2a87529124f173b64c583ad8a26d8683caa1bdd7e634911a95268afd7ac047c9a6858e7493e6bc1973abe54f6bed8eb6357e12fa15c3fd4a21
+  data.tar.gz: bc936f4b2eead68e95e7ed803dbfef82abd11a71f1f651a992668c71dd2a098a07b53d38d312de1a16a84b66ddb4b276a0bdb8b230f2ef1ecb9f5083a627a2a3

data/lib/chef/handler/genesis.rb

@@ -23,6 +23,7 @@ class Chef
           @bugsnag_config.app_version = GenesisCollector::VERSION
           @bugsnag_config.project_root = File.expand_path('../../..', File.dirname(__FILE__))
           @bugsnag_config.release_stage = run_context.node.chef_environment
+          @config[:error_handler] = ->(e) { Bugsnag::Notification.new(e, @bugsnag_config).deliver }
         end
         prepare_report
         send_report

data/lib/genesis_collector/collector.rb

@@ -27,13 +27,13 @@ module GenesisCollector
 
     def collect!
       @sku = get_sku
-      collect_basic_data
-      collect_chef
-      collect_ipmi
-      collect_network_interfaces
-      collect_disks
-      collect_cpus
-      collect_memories
+      safely { collect_basic_data }
+      safely { collect_chef }
+      safely { collect_ipmi }
+      safely { collect_network_interfaces }
+      safely { collect_disks }
+      safely { collect_cpus }
+      safely { collect_memories }
       @payload
     end
 
@@ -114,6 +114,13 @@ module GenesisCollector
 
     private
 
+    def safely
+      yield
+    rescue StandardError => ex
+      STDERR.puts ex.message
+      @config[:error_handler].call(ex) if @config[:error_handler]
+    end
+
     def shellout_with_timeout(command, timeout = 2)
       response = `timeout #{timeout} #{command}`
       unless $CHILD_STATUS.success?
@@ -173,6 +180,8 @@ module GenesisCollector
                        'UKN'
       end
       "#{manufacturer}-#{serial}".gsub('.','') # dells
+    rescue StandardError => ex
+      raise "Unable to deterimine SKU: #{ex.message}"
     end
 
     def read_dmi(key)
@@ -186,5 +195,9 @@ module GenesisCollector
       return nil unless ('A'..'Z').include?(value)
       value.empty? ? nil : value
     end
+
+    def ensure_command(command)
+      !`which #{command}`.empty? || raise("#{command} missing!")
+    end
   end
 end

data/lib/genesis_collector/disks.rb

@@ -2,6 +2,7 @@ module GenesisCollector
   module Disks
 
     def collect_disks
+      ensure_command('smartctl')
       @payload[:disks] = enumerate_disks
       @payload[:disks].each do |d|
         info = get_disk_info(d.delete(:smartctl_cmd))
@@ -13,6 +14,10 @@ module GenesisCollector
         d[:slot] = get_scsi_slot(d[:dev]) if d[:dev] =~ /^\/dev\/sd/
       end
       @payload[:disks].delete_if { |d| d[:serial_number].nil? }
+    rescue StandardError => ex
+      # Just to be sure we don't send partial data
+      @payload.delete(:disks)
+      raise ex
     end
 
     private

data/lib/genesis_collector/version.rb

@@ -1,3 +1,3 @@
 module GenesisCollector
-  VERSION = '0.1.27'
+  VERSION = '0.1.28'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genesis_collector
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - David Radcliffe