Add a 30 sec timeout when shelling out

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/ohai/mixin/command.rb b/lib/ohai/mixin/command.rb
index 8cfc7d10..6be29a7d 100644
--- a/lib/ohai/mixin/command.rb
+++ b/lib/ohai/mixin/command.rb
@@ -29,7 +29,7 @@ module Ohai
   module Mixin
     module Command
       def shell_out(cmd)
-        m = Mixlib::ShellOut.new(cmd)
+        m = Mixlib::ShellOut.new(cmd, :timeout => 30)
         begin
           m.run_command
 
@@ -43,6 +43,9 @@ module Ohai
         rescue Errno::ENOENT => e
           Ohai::Log.debug("Plugin #{self.name} failed to run command #{cmd}")
           raise Ohai::Exceptions::Exec, e
+        rescue Mixlib::ShellOut::CommandTimeout => e
+          Ohai::Log.debug("Plugin #{self.name} timeout after 30s running command #{cmd}")
+          raise Ohai::Exceptions::Exec, e
         end
       end