fix logger using braces instead of parenthesis

Author: Hanna Seweryn

lib/dalli/client.rb

@@ -1,14 +1,14 @@
 # encoding: ascii
 module Dalli
   class Client
-    
+
     ##
     # Dalli::Client is the main class which developers will use to interact with
     # the memcached server.  Usage:
-    # 
-    #   Dalli::Client.new(['localhost:11211:10', 'cache-2.example.com:11211:5', '192.168.0.1:22122:5'], 
+    #
+    #   Dalli::Client.new(['localhost:11211:10', 'cache-2.example.com:11211:5', '192.168.0.1:22122:5'],
     #                   :threadsafe => true, :failover => true, :expires_in => 300)
-    # 
+    #
     # servers is an Array of "host:port:weight" where weight allows you to distribute cache unevenly.
     # Both weight and port are optional.  If you pass in nil, Dalli will default to 'localhost:11211'.
     # Note that the <tt>MEMCACHE_SERVERS</tt> environment variable will override the servers parameter for use
@@ -39,7 +39,7 @@ def self.compatibility_mode=(compatibility_mode)
       require 'dalli/compatibility'
       @compatibility_mode = compatibility_mode
     end
-    
+
     #
     # The standard memcached instruction set
     #
@@ -81,8 +81,8 @@ def get_multi(*keys)
               values[key_without_namespace(key)] = value
             end
           rescue NetworkError => e
-            Dalli.logger.debug { e.message }
-            Dalli.logger.debug { "results from this server will be missing" }
+            Dalli.logger.debug(e.message)
+            Dalli.logger.debug("results from this server will be missing")
           end
         end
         values
@@ -165,7 +165,7 @@ def flush(delay=0)
     ##
     # Incr adds the given amount to the counter on the memcached server.
     # Amt must be a positive value.
-    # 
+    #
     # memcached counters are unsigned and cannot hold negative values.  Calling
     # decr on a counter which is 0 will just return 0.
     #
@@ -181,7 +181,7 @@ def incr(key, amt=1, ttl=nil, default=nil)
     ##
     # Decr subtracts the given amount from the counter on the memcached server.
     # Amt must be a positive value.
-    # 
+    #
     # memcached counters are unsigned and cannot hold negative values.  Calling
     # decr on a counter which is 0 will just return 0.
     #
@@ -239,20 +239,20 @@ def perform(op, key, *args)
         server = ring.server_for_key(key)
         server.request(op, key, *args)
       rescue NetworkError => e
-        Dalli.logger.debug { e.message }
-        Dalli.logger.debug { "retrying request with new server" }
+        Dalli.logger.debug(e.message)
+        Dalli.logger.debug("retrying request with new server")
         retry
       end
     end
-    
+
     def validate_key(key)
       raise ArgumentError, "illegal character in key #{key}" if key.respond_to?(:ascii_only?) && !key.ascii_only?
       raise ArgumentError, "illegal character in key #{key}" if key =~ /\s/
       raise ArgumentError, "illegal character in key #{key}" if key =~ /[\x00-\x20\x80-\xFF]/
       raise ArgumentError, "key cannot be blank" if key.nil? || key.strip.size == 0
       raise ArgumentError, "key too long #{key.inspect}" if key.length > 250
     end
-    
+
     def key_with_namespace(key)
       @options[:namespace] ? "#{@options[:namespace]}:#{key}" : key
     end

lib/dalli/server.rb

@@ -8,7 +8,7 @@ class Server
     attr_accessor :port
     attr_accessor :weight
     attr_accessor :options
-    
+
     DEFAULTS = {
       # seconds between trying to contact a remote server
       :down_retry_delay => 1,
@@ -37,7 +37,7 @@ def initialize(attribs, options = {})
       @sock = nil
       @msg = nil
     end
-    
+
     # Chokepoint method for instrumentation
     def request(op, *args)
       raise Dalli::NetworkError, "#{hostname}:#{port} is down: #{@error} #{@msg}" unless alive?
@@ -65,7 +65,7 @@ def alive?
 
       if @last_down_at && @last_down_at + options[:down_retry_delay] >= Time.now
         time = @last_down_at + options[:down_retry_delay] - Time.now
-        Dalli.logger.debug { "down_retry_delay not reached for #{hostname}:#{port} (%.3f seconds left)" % time }
+        Dalli.logger.debug("down_retry_delay not reached for #{hostname}:#{port} (%.3f seconds left)" % time )
         return false
       end
 
@@ -92,7 +92,7 @@ def unlock!
     private
 
     def failure!
-      Dalli.logger.info { "#{hostname}:#{port} failed (count: #{@fail_count})" }
+      Dalli.logger.info("#{hostname}:#{port} failed (count: #{@fail_count})")
 
       @fail_count += 1
       if @fail_count >= options[:socket_max_failures]
@@ -101,18 +101,18 @@ def failure!
         sleep(options[:socket_failure_delay]) if options[:socket_failure_delay]
       end
     end
-    
+
     def down!
       close
 
       @last_down_at = Time.now
 
       if @down_at
         time = Time.now - @down_at
-        Dalli.logger.debug { "#{hostname}:#{port} is still down (for %.3f seconds now)" % time }
+        Dalli.logger.debug("#{hostname}:#{port} is still down (for %.3f seconds now)" % time)
       else
         @down_at = @last_down_at
-        Dalli.logger.warn { "#{hostname}:#{port} is down" }
+        Dalli.logger.warn("#{hostname}:#{port} is down")
       end
 
       @error = $! && $!.class.name
@@ -123,7 +123,7 @@ def down!
     def up!
       if @down_at
         time = Time.now - @down_at
-        Dalli.logger.warn { "#{hostname}:#{port} is back (downtime was %.3f seconds)" % time }
+        Dalli.logger.warn("#{hostname}:#{port} is back (downtime was %.3f seconds)" % time)
       end
 
       @fail_count = 0
@@ -163,7 +163,7 @@ def add(key, value, ttl, cas, options)
       write(req)
       generic_response unless multi?
     end
-    
+
     def replace(key, value, ttl, options)
       (value, flags) = serialize(key, value, options)
       req = [REQUEST, OPCODES[multi? ? :replaceq : :replace], key.bytesize, 8, 0, 0, value.bytesize + key.bytesize + 8, 0, 0, flags, ttl, key, value].pack(FORMAT[:replace])
@@ -193,7 +193,7 @@ def decr(key, count, ttl, default)
       body = generic_response
       body ? longlong(*body.unpack('NN')) : body
     end
-    
+
     def incr(key, count, ttl, default)
       expiry = default ? ttl : 0xFFFFFFFF
       default ||= 0
@@ -204,7 +204,7 @@ def incr(key, count, ttl, default)
       body = generic_response
       body ? longlong(*body.unpack('NN')) : body
     end
-    
+
     # Noop is a keepalive operation but also used to demarcate the end of a set of pipelined commands.
     # We need to read all the responses at once.
     def noop
@@ -376,7 +376,7 @@ def read(count)
     end
 
     def connect
-      Dalli.logger.debug { "Dalli::Server#connect #{hostname}:#{port}" }
+      Dalli.logger.debug("Dalli::Server#connect #{hostname}:#{port}")
 
       begin
         @sock = KSocket.open(hostname, port, :timeout => options[:socket_timeout])
@@ -401,7 +401,7 @@ def longlong(a, b)
 
     REQUEST = 0x80
     RESPONSE = 0x81
-    
+
     RESPONSE_CODES = {
       0 => 'No error',
       1 => 'Key not found',
@@ -414,7 +414,7 @@ def longlong(a, b)
       0x81 => 'Unknown command',
       0x82 => 'Out of memory',
     }
-    
+
     OPCODES = {
       :get => 0x00,
       :set => 0x01,
@@ -440,7 +440,7 @@ def longlong(a, b)
       :auth_request => 0x21,
       :auth_continue => 0x22,
     }
-    
+
     HEADER = "CCnCCnNNQ"
     OP_FORMAT = {
       :get => 'a*',
@@ -470,7 +470,7 @@ def longlong(a, b)
     def need_auth?
       @options[:username] || ENV['MEMCACHE_USERNAME']
     end
-    
+
     def username
       @options[:username] || ENV['MEMCACHE_USERNAME']
     end
@@ -480,7 +480,7 @@ def password
     end
 
     def sasl_authentication
-      Dalli.logger.info { "Dalli/SASL authenticating as #{username}" }
+      Dalli.logger.info("Dalli/SASL authenticating as #{username}")
 
       # negotiate
       req = [REQUEST, OPCODES[:auth_negotiation], 0, 0, 0, 0, 0, 0, 0].pack(FORMAT[:noop])