allow threading of cassandra cluster options through alia (#146)

* store: allow threading of cluster options to alia * project: bump alia to 3.3.0 * project: wrong dependency * project: switch to clojure 1.9 * store: do not forward `use` to cluster-options * store: do not forward `default-region` to cluster-options * store: store options in cassandra-options key * fix classpath conflicts if using unilog JSON encoding
exoscale · Feb 8, 2017 · 35d7123 · 35d7123
1 parent 765456d
commit 35d7123
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/project.clj b/project.clj
@@ -8,7 +8,7 @@
   :main io.pithos
   :jvm-opts ["-Xmx2g"]
   :profiles {:dev {:resource-paths ["test/data"]}}
-  :dependencies [[org.clojure/clojure           "1.8.0"]
+  :dependencies [[org.clojure/clojure           "1.9.0-alpha14"]
                  [org.clojure/data.codec        "0.1.0"]
                  [org.clojure/data.xml          "0.0.8"]
                  [org.clojure/data.zip          "0.1.1"]
@@ -21,12 +21,12 @@
                  [spootnik/uncaught             "0.5.3"]
                  [clj-yaml                      "0.4.0"]
                  [clout                         "2.1.2"]
-                 [cheshire                      "5.5.0"]
+                 [cheshire                      "5.6.3"]
                  [clj-time                      "0.9.0"]
                  [ring/ring-core                "1.3.2"
                   :exclusions [org.clojure/tools.reader]]
                  [ring/ring-codec               "1.0.0"]
-                 [cc.qbits/alia                 "3.1.10"]
+                 [cc.qbits/alia-all             "3.3.0"]
                  [cc.qbits/hayt                 "3.0.1"]
                  [cc.qbits/jet                  "0.7.9"
                   :exclusions [org.clojure/tools.reader]]

diff --git a/src/io/pithos/store.clj b/src/io/pithos/store.clj
@@ -17,15 +17,15 @@
 (defn cassandra-store
   "Connect to a cassandra cluster, and use a specific keyspace.
    When the keyspace is not found, try creating it"
-  [{:keys [cluster keyspace hints repfactor username password]}]
+  [{:keys [cassandra-options cluster keyspace hints repfactor username password]}]
   (debug "building cassandra store for: " cluster keyspace hints)
   (let [hints   (or hints
-                    {:replication {:class             "SimpleStrategy"
+                    {:replication {:class              "SimpleStrategy"
                                    :replication_factor (or repfactor 1)}})
         cluster (if (sequential? cluster) cluster [cluster])
-        session (-> {:contact-points cluster}
+        session (-> (assoc cassandra-options :contact-points cluster)
                     (cond-> (and username password)
-                      (assoc :credentials {:user username
+                      (assoc :credentials {:user     username
                                            :password password}))
                     (alia/cluster)
                     (alia/connect))]