cleanup

matthiasn · matthiasn · commit db150cdc8328 · 2014-09-15T10:04:25.000+02:00
diff --git a/Clojure-Websockets/src/clj/birdwatch/channels.clj b/Clojure-Websockets/src/clj/birdwatch/channels.clj
@@ -3,41 +3,34 @@
   (:require
    [clojure.tools.logging :as log]
    [com.stuartsierra.component :as component]
-   [clojure.core.async :as async :refer [<! <!! >! >!! chan put! alts! mult tap timeout go go-loop]]))
+   [clojure.core.async :as async :refer [chan mult tap]]))
 
 (defrecord Channels []
   component/Lifecycle
   (start [component]
          (log/info "Starting Channels")
          (let [tweets (chan)
-               tweet-missing (chan) ; channel for requesting missing tweet
-               missing-tweet-found (chan); channel for responding to missing request
+               tweets-mult (mult tweets)
                persistence (chan)
                rt-persistence (chan)
-               percolation (chan)
-               percolation-matches (chan 10000)
-               register-percolation (chan)
-               query (chan)
-               query-results (chan)
-               tweets-mult (mult tweets)
-               tweet-count (chan)]
+               percolation (chan)]
            ;; fan tweet out into multiple channels (through tweets-mult created above)
            (tap tweets-mult percolation)
            (tap tweets-mult persistence)
            (tap tweets-mult rt-persistence)
            (assoc component
              :tweets tweets
-             :tweet-missing tweet-missing
-             :missing-tweet-found missing-tweet-found
+             :tweets-mult tweets-mult
              :persistence persistence
              :rt-persistence rt-persistence
              :percolation percolation
-             :percolation-matches percolation-matches
-             :register-percolation register-percolation
-             :query query
-             :query-results query-results
-             :tweets-mult tweets-mult
-             :tweet-count tweet-count)))
+             :tweet-missing (chan) ; channel for requesting missing tweet
+             :missing-tweet-found (chan); channel for responding to missing request
+             :percolation-matches (chan)
+             :register-percolation (chan)
+             :query (chan)
+             :query-results (chan)
+             :tweet-count (chan))))
   (stop [component]
         (log/info "stop connection to Twitter Streaming API")
         (assoc component :tweets nil      :tweet-missing nil  :missing-tweet-found nil
diff --git a/Clojure-Websockets/src/clj/birdwatch/communicator.clj b/Clojure-Websockets/src/clj/birdwatch/communicator.clj
@@ -7,7 +7,7 @@
    [taoensso.sente     :as sente]
    [taoensso.sente.packers.transit :as sente-transit]
    [com.stuartsierra.component :as component]
-   [clojure.core.async :as async :refer [<! <!! >! >!! chan put! alts! timeout go go-loop]]))
+   [clojure.core.async :as async :refer [<! >! put! timeout go-loop]]))
 
 (def packer (sente-transit/get-flexi-packer :json)) ;; serialization format for client<->server comm
 
diff --git a/Clojure-Websockets/src/clj/birdwatch/http.clj b/Clojure-Websockets/src/clj/birdwatch/http.clj
@@ -9,8 +9,7 @@
    [compojure.route    :as route]
    [com.stuartsierra.component :as component]))
 
-(def ring-defaults-config (assoc-in ring.middleware.defaults/site-defaults
-                                    [:security :anti-forgery]
+(def ring-defaults-config (assoc-in ring.middleware.defaults/site-defaults [:security :anti-forgery]
                                     {:read-token (fn [req] (-> req :params :csrf-token))}))
 
 (defrecord Httpserver [conf communicator server]
diff --git a/Clojure-Websockets/src/clj/birdwatch/percolator.clj b/Clojure-Websockets/src/clj/birdwatch/percolator.clj
@@ -9,7 +9,7 @@
    [clojurewerkz.elastisch.rest.percolation :as perc]
    [clojurewerkz.elastisch.rest.response    :as esrsp]
    [com.stuartsierra.component :as component]
-   [clojure.core.async :as async :refer [<! <!! >! >!! chan put! alts! timeout go go-loop close!]]))
+   [clojure.core.async :as async :refer [<! put! go-loop]]))
 
 (defn start-percolator [{:keys [query uid]} conn subscriptions]
   "register percolation search with ID based on hash of the query"
diff --git a/Clojure-Websockets/src/clj/birdwatch/persistence.clj b/Clojure-Websockets/src/clj/birdwatch/persistence.clj
@@ -13,7 +13,7 @@
    [clojurewerkz.elastisch.query            :as q]
    [clojurewerkz.elastisch.rest.response    :as esrsp]
    [com.stuartsierra.component :as component]
-   [clojure.core.async :as async :refer [<! <!! >! >!! chan put! alts! timeout go go-loop close!]]))
+   [clojure.core.async :as async :refer [<! chan put! timeout go-loop]]))
 
 (defn native-query [{:keys [query n from]} conf native-conn]
   "run a query on previous matching tweets"
