Merge pull request #1227 from WheresAlice/configurable_timeout

Make the default shell_out timeout of 30 seconds configurable

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/ohai/config.rb b/lib/ohai/config.rb
index 085bcb9b..6029a26f 100644
--- a/lib/ohai/config.rb
+++ b/lib/ohai/config.rb
@@ -40,6 +40,7 @@ module Ohai
       default :run_all_plugins, false
       # optional plugins are the set of plugins that are marked optional but you wish to run.
       default :optional_plugins, []
+      default :shellout_timeout, 30
     end
   end
 
diff --git a/lib/ohai/mixin/command.rb b/lib/ohai/mixin/command.rb
index f1236754..eb4844b5 100644
--- a/lib/ohai/mixin/command.rb
+++ b/lib/ohai/mixin/command.rb
@@ -28,8 +28,8 @@ module Ohai
       # accept a command and any of the mixlib-shellout options
       def shell_out(cmd, **options)
         options = options.dup
-        # unless specified by the caller timeout after 30 seconds
-        options[:timeout] ||= 30
+        # unless specified by the caller timeout after configured timeout (default 30 seconds)
+        options[:timeout] ||= Ohai::Config.ohai[:shellout_timeout]
         unless RUBY_PLATFORM =~ /mswin|mingw32|windows/
           options[:env] = options.key?(:env) ? options[:env].dup : {}
           options[:env]["PATH"] ||= ((ENV["PATH"] || "").split(":") + %w{/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin}).join(":")