Commit 3c97aea3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'batch-add-keys-timeout'

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parents 27af59cc 1bfa3fda
v2.6.4 v2.6.4
- Remove keys from authorized_keys in-place - Remove keys from authorized_keys in-place
- Increase batch_add_keys lock timeout to 300 seconds
v2.6.3 v2.6.3
- Prevent keys with a very specific comment from accidentally being deleted. - Prevent keys with a very specific comment from accidentally being deleted.
......
...@@ -52,7 +52,7 @@ class GitlabKeys ...@@ -52,7 +52,7 @@ class GitlabKeys
end end
def batch_add_keys def batch_add_keys
lock do lock(300) do # Allow 300 seconds (5 minutes) for batch_add_keys
open(auth_file, 'a') do |file| open(auth_file, 'a') do |file|
stdin.each_line do |input| stdin.each_line do |input|
tokens = input.strip.split("\t") tokens = input.strip.split("\t")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment