diff options
author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-08-13 14:52:44 +0200 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-08-16 14:15:50 +0200 |
commit | ee603a0089520ae22a97d9f5f5d7d083c2fe24ce (patch) | |
tree | 984172075e46425056f1318fcaa29c886ae00ad9 /config | |
parent | 2b950014c35534c817c58ebf43dcbf4bbf490b9e (diff) | |
download | gitlab-ce-ee603a0089520ae22a97d9f5f5d7d083c2fe24ce.tar.gz |
Allow a `failure_wait_time` of 0 for storage access
This allows testing every storage attempt after a failure. Which could
be useful for tests
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/6_validations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/6_validations.rb b/config/initializers/6_validations.rb index 92ce4dd03cd..f8e67ce04c9 100644 --- a/config/initializers/6_validations.rb +++ b/config/initializers/6_validations.rb @@ -37,12 +37,12 @@ def validate_storages_config storage_validation_error("#{name} is not a valid storage, because it has no `path` key. Refer to gitlab.yml.example for an updated example") end - %w(failure_count_threshold failure_wait_time failure_reset_time storage_timeout).each do |setting| + %w(failure_count_threshold failure_reset_time storage_timeout).each do |setting| # Falling back to the defaults is fine! next if repository_storage[setting].nil? unless repository_storage[setting].to_f > 0 - storage_validation_error("#{setting}, for storage `#{name}` needs to be greater than 0") + storage_validation_error("`#{setting}` for storage `#{name}` needs to be greater than 0") end end end |