summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-04-03 14:14:32 -0700
committerTim Smith <tsmith@chef.io>2017-04-03 14:14:32 -0700
commitd1823215f180287ca4705bafcb892ea4fdb0ddeb (patch)
tree0e9b90ecc9ab36ce6b95792269010ca6bce4814b
parent58296dc0035e4f94a7b7cdc1db01887a3c3c1e30 (diff)
downloadohai-d1823215f180287ca4705bafcb892ea4fdb0ddeb.tar.gz
Shorten the sbt shellout timeout period
30 seconds is way too high here. On my mac the sbt command fails (a whole different issue), but we take 30 seconds to skip the plugin. There’s no reason to wait 30 seconds here for a plugin that doesn’t need that. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/ohai/plugins/scala.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ohai/plugins/scala.rb b/lib/ohai/plugins/scala.rb
index 1f019bb2..22e34d82 100644
--- a/lib/ohai/plugins/scala.rb
+++ b/lib/ohai/plugins/scala.rb
@@ -35,7 +35,7 @@ Ohai.plugin(:Scala) do
# Check for sbt
begin
# sbt launcher version 0.13.7
- so = shell_out("sbt --version")
+ so = shell_out("sbt --version", timeout: 5)
if so.exitstatus == 0
scala[:sbt] = Mash.new
scala[:sbt][:version] = so.stdout.split[3]