Merge pull request #583 from petergoldstein/bugfix/minor_errors_in_582

Fix a couple of minor errors in my last PR
petergoldstein · Dec 13, 2015 · cc4019e · cc4019e
2 parents c749402 + dc887c5
commit cc4019e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/dalli/client.rb b/lib/dalli/client.rb
@@ -108,7 +108,6 @@ def fetch(key, ttl=nil, options=nil)
     # - false if the value was changed by someone else.
     # - true if the value was successfully updated.
     def cas(key, ttl=nil, options=nil)
-      ttl = ttl_or_default(ttl)
       (value, cas) = perform(:cas, key)
       value = (!value || value == 'Not found') ? nil : value
       if value

diff --git a/lib/dalli/server.rb b/lib/dalli/server.rb
@@ -486,7 +486,7 @@ def guard_max_value(key, value)
     def sanitize_ttl(ttl)
       ttl_as_i = ttl.to_i
       return ttl_as_i if ttl_as_i <= MAX_ACCEPTABLE_EXPIRATION_INTERVAL
-      Dalli.logger.debug "Expiration interval (ttl_as_i) too long for Memcached, converting to an expiration timestamp"
+      Dalli.logger.debug "Expiration interval (#{ttl_as_i}) too long for Memcached, converting to an expiration timestamp"
       Time.now.to_i + ttl_as_i
     end