summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Kemp <steve@steve.org.uk>2013-05-15 14:10:37 +0100
committerSteve Kemp <steve@steve.org.uk>2013-05-15 14:10:37 +0100
commit0a1e1128f72ef8316a620f6f071f003d01bbe8c4 (patch)
treeebe29b020d8d4edff14fdcd7b1650fb998ba6f74
parent06b787d93b08a917cb1ec66bb573108dc6e0de43 (diff)
Correctly work if we have no settings file present.
Previously we'd try to find the setting "foo" like so: @settings['foo'].to_i || 5 This would fail if the setting wasn't defined, because nil.to_i results in 0. But we must call to_i otherwise we'll have issues comparing strings/numbers.
-rw-r--r--lib/custodian/settings.rb18
1 files changed, 15 insertions, 3 deletions
diff --git a/lib/custodian/settings.rb b/lib/custodian/settings.rb
index 1efabf6..f177083 100644
--- a/lib/custodian/settings.rb
+++ b/lib/custodian/settings.rb
@@ -95,7 +95,11 @@ module Custodian
def timeout
_load() unless( _loaded? )
- @settings['timeout'].to_i || 30
+ if ( @settings['timeout'] )
+ @settings['timeout'].to_i
+ else
+ 30
+ end
end
@@ -107,7 +111,11 @@ module Custodian
def retries
_load() unless( _loaded? )
- @settings['retries' ].to_i || 5
+ if ( @settings['retries'] )
+ @settings['retries'].to_i
+ else
+ 5
+ end
end
@@ -123,7 +131,11 @@ module Custodian
def retry_delay
_load() unless( _loaded? )
- @settings['retry_delay'].to_i || 0
+ if ( @settings['retry_delay'] )
+ @settings['retry_delay'].to_i
+ else
+ 0
+ end
end