From c7201f63cf5f12f1acda5d2c3963742ea292e60a Mon Sep 17 00:00:00 2001 From: secgen server Date: Fri, 9 Feb 2018 15:34:01 +0000 Subject: [PATCH] timeout changes --- lib/batch/batch_secgen.rb | 2 +- lib/helpers/gem_exec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/batch/batch_secgen.rb b/lib/batch/batch_secgen.rb index 168f954cc..319d7ee66 100644 --- a/lib/batch/batch_secgen.rb +++ b/lib/batch/batch_secgen.rb @@ -118,7 +118,7 @@ def get_delete_opts end def parse_opts(opts) - options = {:instances => '', :max_threads => 3, :id => nil, :all => false} + options = {:instances => '', :max_threads => 2, :id => nil, :all => false} opts.each do |opt, arg| case opt when '--instances' diff --git a/lib/helpers/gem_exec.rb b/lib/helpers/gem_exec.rb index beaa1cb0d..7cf54f1d8 100644 --- a/lib/helpers/gem_exec.rb +++ b/lib/helpers/gem_exec.rb @@ -39,7 +39,7 @@ class GemExec Dir.chdir(working_dir) output_hash = {:output => '', :status => 0, :exception => nil} begin - output_hash[:output] = ProcessHelper.process("#{gem_path} #{arguments}", {:pty => true, :timeout => (60 * 10), + output_hash[:output] = ProcessHelper.process("#{gem_path} #{arguments}", {:pty => true, :timeout => (60 * 30), include_output_in_exception: true}) rescue Exception => ex output_hash[:status] = 1