From a3feeb6454bee3276ded5c8e3d573d3bde849ff2 Mon Sep 17 00:00:00 2001
From: Marcin Kulik <m@ku1ik.com>
Date: Tue, 18 Apr 2017 23:57:02 +0200
Subject: [PATCH] Use :uri instead of :host/:port as :spec for carmine

---
 resources/asciinema/system.edn           | 3 +--
 src/asciinema/component/redis_client.clj | 8 ++++----
 src/asciinema/main.clj                   | 3 +--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/resources/asciinema/system.edn b/resources/asciinema/system.edn
index aa5b2c8..5948b61 100644
--- a/resources/asciinema/system.edn
+++ b/resources/asciinema/system.edn
@@ -25,8 +25,7 @@
    :bucket s3-bucket
    :path-prefix "uploads/"}
   :exp-set
-  {:host redis-host
-   :port redis-port}
+  {:uri redis-url}
   :png-gen
   {:bin-path a2png-bin-path}
   :executor
diff --git a/src/asciinema/component/redis_client.clj b/src/asciinema/component/redis_client.clj
index 07af0f6..da725a4 100644
--- a/src/asciinema/component/redis_client.clj
+++ b/src/asciinema/component/redis_client.clj
@@ -5,12 +5,12 @@
             [com.stuartsierra.component :as component]
             [taoensso.carmine :as car]))
 
-(defrecord RedisClient [host port]
+(defrecord RedisClient [uri]
   component/Lifecycle
   (start [component]
     (if (:listener component)
       component
-      (let [conn {:pool {} :spec {:host host :port port}}]
+      (let [conn {:pool {} :spec {:uri uri}}]
         (assoc component :conn conn))))
   (stop [component]
     (if (:conn component)
@@ -24,5 +24,5 @@
   (contains? [this value]
     (car/as-bool (car/wcar (:conn this) (car/exists value)))))
 
-(defn redis-client [{:keys [host port]}]
-  (->RedisClient host port))
+(defn redis-client [{:keys [uri]}]
+  (->RedisClient uri))
diff --git a/src/asciinema/main.clj b/src/asciinema/main.clj
index 7eecb3e..1248443 100644
--- a/src/asciinema/main.clj
+++ b/src/asciinema/main.clj
@@ -32,8 +32,7 @@
                     's3-bucket (:s3-bucket env)
                     's3-access-key (:s3-access-key env)
                     's3-secret-key (:s3-secret-key env)
-                    'redis-host (:redis-host env "localhost")
-                    'redis-port (Integer/parseInt (:redis-port env "6379"))
+                    'redis-url (:redis-url env "redis://localhost")
                     'a2png-bin-path (:a2png-bin-path env "a2png/a2png.sh")}
           system (->> (load-system [(io/resource "asciinema/system.edn")] bindings)
                       (component/start))]