Update Clojure tutorials for Langohr 3.0

michaelklishin · michaelklishin · commit ea9f7336665d · 2014-08-23T12:55:58.000+04:00
diff --git a/clojure/src/rabbitmq/tutorials/emit_log.clj b/clojure/src/rabbitmq/tutorials/emit_log.clj
@@ -14,6 +14,6 @@
           payload (if (empty? args)
                     "Hello, world!"
                     (s/join " " args))]
-      (le/fanout ch x :durable false :auto-delete false)
+      (le/fanout ch x {:durable false :auto-delete false})
       (lb/publish ch x "" payload)
       (println (format " [x] Sent %s" payload)))))
diff --git a/clojure/src/rabbitmq/tutorials/emit_log_direct.clj b/clojure/src/rabbitmq/tutorials/emit_log_direct.clj
@@ -15,6 +15,6 @@
           payload  (if (empty? args)
                      "Hello, world!"
                      (s/join " " args))]
-      (le/direct ch x :durable false :auto-delete false)
+      (le/direct ch x {:durable false :auto-delete false})
       (lb/publish ch x severity payload)
       (println (format " [x] Sent %s" payload)))))
diff --git a/clojure/src/rabbitmq/tutorials/emit_log_topic.clj b/clojure/src/rabbitmq/tutorials/emit_log_topic.clj
@@ -15,6 +15,6 @@
           payload  (if (empty? args)
                      "Hello, world!"
                      (s/join " " args))]
-      (le/topic ch x :durable false :auto-delete false)
+      (le/topic ch x {:durable false :auto-delete false})
       (lb/publish ch x severity payload)
       (println (format " [x] Sent %s" payload)))))
diff --git a/clojure/src/rabbitmq/tutorials/new_task.clj b/clojure/src/rabbitmq/tutorials/new_task.clj
@@ -12,6 +12,6 @@
           payload (if (empty? args)
                     "Hello, world!"
                     (s/join " " args))]
-      (lq/declare ch "task_queue" :durable true :auto-delete false)
-      (lb/publish ch "" "task_queue" payload :persistent true)
+      (lq/declare ch "task_queue" {:durable true :auto-delete false})
+      (lb/publish ch "" "task_queue" payload {:persistent true})
       (println (format " [x] Sent %s" payload)))))
diff --git a/clojure/src/rabbitmq/tutorials/receive.clj b/clojure/src/rabbitmq/tutorials/receive.clj
@@ -13,6 +13,6 @@
   [& args]
   (with-open [conn (lc/connect)]
     (let [ch   (lch/open conn)]
-      (lq/declare ch "hello" :durable false :auto-delete false)
+      (lq/declare ch "hello" {:durable false :auto-delete false})
       (println " [*] Waiting for messages. To exit press CTRL+C")
-      (lcons/blocking-subscribe ch "hello" handle-delivery :auto-ack true))))
+      (lcons/blocking-subscribe ch "hello" handle-delivery {:auto-ack true}))))
diff --git a/clojure/src/rabbitmq/tutorials/receive_logs.clj b/clojure/src/rabbitmq/tutorials/receive_logs.clj
@@ -18,8 +18,8 @@
   [& args]
   (with-open [conn (lc/connect)]
     (let [ch              (lch/open conn)
-          {:keys [queue]} (lq/declare ch "" :durable true :auto-delete false)]
-      (le/fanout ch x :durable false :auto-delete false)
+          {:keys [queue]} (lq/declare ch "" {:durable true :auto-delete false})]
+      (le/fanout ch x {:durable false :auto-delete false})
       (lq/bind ch queue x)
       (println " [*] Waiting for logs. To exit press CTRL+C")
       (lcons/blocking-subscribe ch queue handle-delivery))))
diff --git a/clojure/src/rabbitmq/tutorials/receive_logs_direct.clj b/clojure/src/rabbitmq/tutorials/receive_logs_direct.clj
@@ -18,9 +18,9 @@
   [& args]
   (with-open [conn (lc/connect)]
     (let [ch              (lch/open conn)
-          {:keys [queue]} (lq/declare ch "" :durable false :auto-delete false)]
-      (le/direct ch x :durable false :auto-delete false)
+          {:keys [queue]} (lq/declare ch "" {:durable false :auto-delete false})]
+      (le/direct ch x {:durable false :auto-delete false})
       (doseq [severity args]
-        (lq/bind ch queue x :routing-key severity))
+        (lq/bind ch queue x {:routing-key severity}))
       (println " [*] Waiting for logs. To exit press CTRL+C")
       (lcons/blocking-subscribe ch queue handle-delivery))))
diff --git a/clojure/src/rabbitmq/tutorials/receive_logs_topic.clj b/clojure/src/rabbitmq/tutorials/receive_logs_topic.clj
@@ -18,9 +18,9 @@
   [& args]
   (with-open [conn (lc/connect)]
     (let [ch              (lch/open conn)
-          {:keys [queue]} (lq/declare ch "" :durable false :auto-delete false)]
-      (le/topic ch x :durable false :auto-delete false)
+          {:keys [queue]} (lq/declare ch "" {:durable false :auto-delete false})]
+      (le/topic ch x {:durable false :auto-delete false})
       (doseq [severity args]
-        (lq/bind ch queue x :routing-key severity))
+        (lq/bind ch queue x {:routing-key severity}))
       (println " [*] Waiting for logs. To exit press CTRL+C")
       (lcons/blocking-subscribe ch queue handle-delivery))))
diff --git a/clojure/src/rabbitmq/tutorials/send.clj b/clojure/src/rabbitmq/tutorials/send.clj
@@ -9,6 +9,6 @@
   [& args]
   (with-open [conn (lc/connect)]
     (let [ch   (lch/open conn)]
-      (lq/declare ch "hello" :durable false :auto-delete false)
+      (lq/declare ch "hello" {:durable false :auto-delete false})
       (lb/publish ch "" "hello" (.getBytes "Hello World!" "UTF-8"))
       (println " [x] Sent 'Hello World!'"))))
diff --git a/clojure/src/rabbitmq/tutorials/worker.clj b/clojure/src/rabbitmq/tutorials/worker.clj
@@ -28,7 +28,7 @@
   [& args]
   (with-open [conn (lc/connect)]
     (let [ch      (lch/open conn)]
-      (lq/declare ch q :durable true :auto-delete false)
+      (lq/declare ch q {:durable true :auto-delete false})
       (lb/qos ch 1)
       (println " [*] Waiting for messages. To exit press CTRL+C")
       (lcons/blocking-subscribe ch q handle-delivery))))
