summaryrefslogtreecommitdiff
path: root/lib/gitlab_keys.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-07-16 10:22:56 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-07-16 10:22:56 +0200
commit1bfa3fda1d466e1ef97c3e4106b8b3d7fbe5f020 (patch)
treeb5cfe601aa0f87c7270f3e948a36f4279b7a3678 /lib/gitlab_keys.rb
parent4d30c0c5d3d0f23a221ee507b6bd110a539b8570 (diff)
downloadgitlab-shell-1bfa3fda1d466e1ef97c3e4106b8b3d7fbe5f020.tar.gz
Increase batch_add_keys lock timeout to 300 seconds
Diffstat (limited to 'lib/gitlab_keys.rb')
-rw-r--r--lib/gitlab_keys.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
index 10f84bd..ca3a816 100644
--- a/lib/gitlab_keys.rb
+++ b/lib/gitlab_keys.rb
@@ -53,7 +53,7 @@ class GitlabKeys
end
def batch_add_keys
- lock do
+ lock(300) do # Allow 300 seconds (5 minutes) for batch_add_keys
open(auth_file, 'a') do |file|
stdin.each_line do |input|
tokens = input.strip.split("\t")