match changes to lamina

hozumi · Dec 29, 2010 · f006f68 · f006f68
1 parent 7af67d7
commit f006f68
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 55 deletions.
diff --git a/src/aleph/netty.clj b/src/aleph/netty.clj
@@ -132,7 +132,7 @@
 
 (defn error-stage-handler [evt]
   (when (instance? ExceptionEvent evt)
-    (log/error (.getCause ^ExceptionEvent evt)))
+    (log/warn "aleph.netty" (.getCause ^ExceptionEvent evt)))
   evt)
 
 (defmacro create-netty-pipeline

diff --git a/src/aleph/redis.clj b/src/aleph/redis.clj
@@ -20,13 +20,15 @@
    (f [\"set\" \"foo\" \"bar\"] timeout?)
 
    The function will return a result-channel representing the response.  To close the
-   connection, use lamina.connections/close-client."
+   connection, use lamina.connections/close-connection."
   ([host]
      (redis-client :utf-8 host))
   ([charset host]
      (redis-client charset host 6379))
   ([charset host port]
-     (pipelined-client #(tcp-client {:host host :port port :frame (redis-codec charset)}))))
+     (client
+       #(tcp-client {:host host :port port :frame (redis-codec charset)})
+       (str "redis @ " host ":" port))))
 
 
 

diff --git a/src/aleph/utils.clj b/src/aleph/utils.clj