Updates for release 1.1

[memstore.git] / memcache / memcache.lisp

diff --git a/memcache/memcache.lisp b/memcache/memcache.lisp
index c5593cbc7ee712a69529275104b20544a7ea4aa2..231065b5c461e6bd5afe9365c3f892a73e908cf3 100644 (file)
--- a/memcache/memcache.lisp
+++ b/memcache/memcache.lisp
@@ -34,7 +34,7 @@
   (print-unreadable-object (mc stream :type t :identity t)
     (format stream "~A on ~A:~A ~AMB"
             (when (slot-boundp mc 'name) (name mc))
-            (when (slot-boundp mc 'ip) (ip mc))
+            (when (slot-boundp mc 'host) (host mc))
             (when (slot-boundp mc 'port) (port mc))
             (when (and (slot-boundp mc 'memcached-server-storage-size)
                        (numberp (slot-value mc 'memcached-server-storage-size)))
@@ -53,10 +53,10 @@
        (setf (slot-value memcache 'memcached-server-storage-size) (mc-stats-limit-maxbytes stats))
        (setf (slot-value memcache 'memcached-server-storage-size) -1))))
 
-(defun make-memcache-instance (&key (ip "127.0.0.1") (port 11211)
+(defun make-memcache-instance (&key (host "127.0.0.1") (port 11211)
                                  (name "Memcache") (pool-size 5))
   "Creates an instance of class MEMCACHE which represents a memcached server."
-  (make-instance 'memcache :name name :ip ip :port port :pool-size pool-size))
+  (make-instance 'memcache :name name :host host :port port :pool-size pool-size))
 
 
 (defmacro with-pool-maybe ((stream memcache use-pool) &body body)
@@ -414,7 +414,7 @@ information about each slot"
   (mc-pool-grow memcache))
 
 (defun mc-make-pool-item (&key (memcache *memcache*))
-  (handler-case (usocket:socket-connect (ip memcache) (port memcache) :element-type '(unsigned-byte 8))
+  (handler-case (usocket:socket-connect (host memcache) (port memcache) :element-type '(unsigned-byte 8))
     (usocket:socket-error (e) (error 'memcached-server-unreachable :error e))
     (error (e) (error 'cannot-make-pool-object :error e))))