Rename :gitolite_lock_wait_time parameter to :gitolite_timeout

Author: root

Diff for: app/views/settings/_gitolite_config_global.html.erb

@@ -4,6 +4,7 @@
 
   gitolite_temp_dir    = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_temp_dir)
   gitolite_scripts_dir = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_scripts_dir)
+  gitolite_timeout     = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_timeout)
   gitolite_log_level   = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_log_level)
   gitolite_log_split   = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_log_split, true)
 
@@ -30,6 +31,13 @@
   <% end %>
 </p>
 
+<p>
+  <label><%= l(:label_gitolite_timeout) %></label>
+  <%= text_field_tag("settings[gitolite_timeout]", "#{gitolite_timeout}", :size => 10) %>
+  <br />
+  <em><%= l(:label_gitolite_timeout_desc) %></em>
+</p>
+
 <p>
   <label><%= l(:label_gitolite_recycle_bin_expiration_time) %></label>
   <%= text_field_tag("settings[gitolite_recycle_bin_expiration_time]", gitolite_recycle_bin_expiration_time, :size => 10) %>

Diff for: config/locales/plugin_settings/en.yml

@@ -47,6 +47,8 @@ en:
   label_gitolite_temp_dir_desc: (Must be absolute)
   label_gitolite_scripts_dir: Scripts dir
   label_gitolite_scripts_dir_desc: (Can be absolute or relative to Redmine root)
+  label_gitolite_timeout: Git timeout
+  label_gitolite_timeout_desc: (In seconds)
 
   label_gitolite_recycle_bin_expiration_time: Expiration time for repositories in recycle bin
   label_gitolite_recycle_bin_expiration_time_desc: (In hours)

Diff for: config/locales/plugin_settings/fr.yml

@@ -47,6 +47,8 @@ fr:
   label_gitolite_temp_dir_desc: (Doit être absolu)
   label_gitolite_scripts_dir: Répertoire des scripts
   label_gitolite_scripts_dir_desc: (Peut être absolu ou relatif à la racine de Redmine)
+  label_gitolite_timeout: Délai d'expiration Git
+  label_gitolite_timeout_desc: (En secondes)
 
   label_gitolite_recycle_bin_expiration_time: Temps d'expiration pour les dépôts dans la corbeille
   label_gitolite_recycle_bin_expiration_time_desc: (En heures)

Diff for: db/migrate/20130807223227_migrate_parameters.rb

@@ -15,7 +15,7 @@ def self.up
 
     new_setting[:gitolite_temp_dir]                    = File.join(ENV['HOME'], 'tmp', 'redmine_git_hosting').to_s
     new_setting[:gitolite_script_dir]                  = './'
-    new_setting[:gitolite_lock_wait_time]              = 10
+    new_setting[:gitolite_timeout]                     = 10
     new_setting[:gitolite_config_file]                 = 'gitolite.conf'
     new_setting[:gitolite_config_has_admin_key]        = true
     new_setting[:gitolite_recycle_bin_expiration_time] = 24.0
@@ -99,7 +99,7 @@ def self.up
             new_setting[:gitolite_recycle_bin_expiration_time] = value
 
           when 'gitLockWaitTime' then
-            new_setting[:gitolite_lock_wait_time] = value
+            new_setting[:gitolite_timeout] = value
 
           # Gitolite Hooks Config
           when 'gitHooksAreAsynchronous' then

Diff for: init.rb

@@ -37,7 +37,7 @@
       # Gitolite Global Config
       :gitolite_temp_dir                     => File.join(Rails.root, 'tmp', 'redmine_git_hosting').to_s,
       :gitolite_scripts_dir                  => './',
-      :gitolite_lock_wait_time               => 10,
+      :gitolite_timeout                      => 10,
       :gitolite_recycle_bin_expiration_time  => 24.0,
       :gitolite_log_level                    => 'info',
       :gitolite_log_split                    => false,

Diff for: lib/redmine_git_hosting/patches/setting_patch.rb

@@ -259,6 +259,16 @@ def save_git_hosting_values
             end
 
 
+            # Validate gitolite_timeout > 0 and < 30 (and exclude non-numbers)
+            if valuehash[:gitolite_timeout]
+              if valuehash[:gitolite_timeout].to_i > 0 and valuehash[:gitolite_timeout].to_i < 30
+                valuehash[:gitolite_timeout] = "#{valuehash[:gitolite_timeout].to_i}"
+              else
+                valuehash[:gitolite_timeout] = @@old_valuehash[:gitolite_timeout]
+              end
+            end
+
+
             ## This a force update
             if valuehash[:gitolite_resync_all_projects] == 'true'
               @@resync_projects = true

Diff for: lib/redmine_gitolite/admin.rb

@@ -19,7 +19,7 @@ def initialize(object_id, action, options)
       @gitolite_admin_ssh_script_path = RedmineGitolite::Config.gitolite_admin_ssh_script_path
       @lock_file_path = File.join(RedmineGitolite::Config.get_temp_dir_path, 'redmine_git_hosting_lock')
       @gitolite_debug = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_log_level) == 'debug' ? true : false
-      @gitolite_timeout = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_lock_wait_time).to_i
+      @gitolite_timeout = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_timeout).to_i
       @gitolite_author  = RedmineGitolite::Config.gitolite_commit_author
 
       @object_id      = object_id