store: wrong optional args

zbintliff · Jun 16, 2015 · 4f13d5b · 4f13d5b
1 parent ab60136
commit 4f13d5b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/project.clj b/project.clj
@@ -6,19 +6,20 @@
   :maintainer {:email "pyr@spootnik.org"}
   :aot :all
   :main io.cyanite
-  :dependencies [[org.clojure/clojure           "1.7.0-alpha2"]
+  :plugins [[lein-ancient "0.6.7"]]
+  :dependencies [[org.clojure/clojure           "1.7.0-beta3"]
                  [org.clojure/tools.logging     "0.3.1"]
                  [org.clojure/tools.cli         "0.3.1"]
                  [org.spootnik/pickler          "0.1.0"]
-                 [org.spootnik/logconfig        "0.7.2"]
+                 [org.spootnik/logconfig        "0.7.3"]
                  [ring/ring-codec               "1.0.0"]
                  [clj-yaml                      "0.4.0"]
                  [clj-http                      "1.0.1"
                   :exclusions [commons-codec]]
-                 [cc.qbits/jet                  "0.5.5"]
-                 [cc.qbits/alia                 "2.2.2"]
-                 [net.jpountz.lz4/lz4           "1.2.0"]
-                 [org.xerial.snappy/snappy-java "1.1.1.3"]
+                 [cc.qbits/jet                  "0.6.2"]
+                 [cc.qbits/alia                 "2.3.9"]
+                 [net.jpountz.lz4/lz4           "1.3"]
+                 [org.xerial.snappy/snappy-java "1.1.1.7"]
                  [io.netty/netty-all            "4.0.19.Final"]
                  [org.clojure/core.async        "0.1.346.0-17112a-alpha"]
                  [clojurewerkz/elastisch        "2.0.0"

diff --git a/src/io/cyanite/store.clj b/src/io/cyanite/store.clj
@@ -140,12 +140,12 @@
   "Connect to cassandra and start a path fetching thread.
    The interval is fixed for now, at 1minute"
   [{:keys [keyspace cluster hints repfactor chan_size batch_size username password]
-    :or   {hints {:replication {:class "SimpleStrategy"
-                                :replication_factor (or repfactor 3)}}
-           chan_size 10000
-           batch_size 500}}]
+    :or   {chan_size 10000 batch_size 500}}]
   (info "creating cassandra metric store")
-(let [cluster (if (sequential? cluster) cluster [cluster])
+  (let [hints   (or hints
+                    {:replication {:class "SimpleStrategy"
+                                   :replication_factor (or repfactor 3)}})
+        cluster (if (sequential? cluster) cluster [cluster])
       session (-> {:contact-points cluster}
           (cond-> (and username password)
                    (assoc :credentials {:user username :password password}))