Increase batch_add_keys lock timeout to 300 seconds

1bfa3fda · Jacob Vosmaer · 4d30c0c5 · 1bfa3fda · 1bfa3fda
Commit 1bfa3fda authored Jul 16, 2015 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

CHANGELOG CHANGELOG +2 -0

lib/gitlab_keys.rb lib/gitlab_keys.rb +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
+v2.6.4
+  - Increase batch_add_keys lock timeout to 300 seconds
 v2.6.3
  - Prevent keys with a very specific comment from accidentally being deleted.


--- 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")