diff options
author | Sean McGivern <sean@gitlab.com> | 2017-05-05 16:40:52 +0300 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2017-05-05 16:40:52 +0300 |
commit | faf2ce89cd4eafdccb78823cf1a32c338a8d9a79 (patch) | |
tree | 1931a7f2929a252778400e2b97d44992f5d5725e /lib | |
parent | 7e0e45dbf174bb82cc0ea8191a869612ad60b4f7 (diff) | |
parent | 0f1273fa44a9122bffbd5cecbaea99b1db781d7e (diff) |
Merge branch 'mrchrisw-import-shell-timeout'
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/shell.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb index 36a871e5bbc..b1d6ea665b7 100644 --- a/lib/gitlab/shell.rb +++ b/lib/gitlab/shell.rb @@ -83,7 +83,7 @@ module Gitlab # Timeout should be less than 900 ideally, to prevent the memory killer # to silently kill the process without knowing we are timing out here. output, status = Popen.popen([gitlab_shell_projects_path, 'import-project', - storage, "#{name}.git", url, '800']) + storage, "#{name}.git", url, "#{Gitlab.config.gitlab_shell.git_timeout}"]) raise Error, output unless status.zero? true end @@ -99,7 +99,7 @@ module Gitlab # fetch_remote("gitlab/gitlab-ci", "upstream") # def fetch_remote(storage, name, remote, forced: false, no_tags: false) - args = [gitlab_shell_projects_path, 'fetch-remote', storage, "#{name}.git", remote, '800'] + args = [gitlab_shell_projects_path, 'fetch-remote', storage, "#{name}.git", remote, "#{Gitlab.config.gitlab_shell.git_timeout}"] args << '--force' if forced args << '--no-tags' if no_tags |