(feat) added client support for slacker 0.14 base

Signed-off-by: Ning Sun <sunng@about.me>
sunng87 · May 3, 2016 · 1a4c2c9 · 1a4c2c9
1 parent e08c24f
commit 1a4c2c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/examples/slacker/example/cluster_client.clj b/examples/slacker/example/cluster_client.clj
@@ -1,7 +1,7 @@
 (ns slacker.example.cluster-client
   (:use [slacker.common])
   (:use [slacker.client.cluster])
-  (:use [slacker.client :only [close-slackerc]]))
+  (:use [slacker.client :only [close-slackerc shutdown-slacker-client-factory]]))
 
 (def sc (clustered-slackerc "example-cluster" "127.0.0.1:2181"))
 
@@ -22,18 +22,16 @@
   :grouping-results :map
   :async? true
   :callback (fn [e r]
-              (println r)))
+              (println "++++" r)))
 
 (defn -main [& args]
-  (binding [*debug* true]
-    (println (timestamp))
-    (println (rand-ints 10))
-    (println @(async-timestamp)))
-
   (dotimes [_ 100] (timestamp))
 
+  (println (echo 23))
   (println (all-timestamp))
   (async-timestamp)
+  (try (make-error) (catch Exception e (println "Expected exception:" (ex-data e))))
 
   (close-slackerc sc)
-  (System/exit 0))
+  (shutdown-slacker-client-factory)
+  (shutdown-agents))
diff --git a/src/slacker/client/cluster.clj b/src/slacker/client/cluster.clj
@@ -304,10 +304,14 @@
                                grouping-exceptions*
                                target-servers)
           cb-results (atom [])
-          sys-cb (fn [result]
-                   (when (= (count (swap! cb-results conj result))
-                            (count target-servers))
-                     (cb (grouping-fn @cb-results))))]
+          target-servers-count (count target-servers)
+          sys-cb (when cb
+                   (fn [excp data]
+                     (when (= (count (swap! cb-results conj
+                                            {:cause excp :result data}))
+                              target-servers-count)
+                       (let [grouped-results (grouping-fn @cb-results)]
+                         (cb (:cause grouped-results) (:result grouped-results))))))]
       (if (empty? target-conns)
         (doto (promise) (deliver (if (contains? call-options :unavailable-value)
                                    {:result (:unavailable-value call-options)}