Log non-0 exit codes and raise our own exception

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/ohai/mixin/command.rb b/lib/ohai/mixin/command.rb
index 0d9ae5a9..8cfc7d10 100644
--- a/lib/ohai/mixin/command.rb
+++ b/lib/ohai/mixin/command.rb
@@ -32,11 +32,17 @@ module Ohai
         m = Mixlib::ShellOut.new(cmd)
         begin
           m.run_command
-          Ohai::Log.debug("Plugin #{self.name} successfully ran command #{cmd}")
+
+          if m.exitstatus == 0
+            Ohai::Log.debug("Plugin #{self.name} successfully ran command #{cmd}")
+          else
+            Ohai::Log.debug("Plugin #{self.name} command #{cmd} returned status #{m.exitstatus}")
+          end
+
           m
         rescue Errno::ENOENT => e
           Ohai::Log.debug("Plugin #{self.name} failed to run command #{cmd}")
-          raise
+          raise Ohai::Exceptions::Exec, e
         end
       end