gered/mtgcoll
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ns reloading fixes for http sessions and views/sente components

Browse source
This commit is contained in:
Gered 2018-06-09 11:13:58 -04:00
parent dd01d77a1b
commit 710c4bbba1
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
project.clj
View file

@ -20,7 +20,6 @@
[gered/webtools.reagent "0.1.1"] [gered/webtools.reagent "0.1.1"]
[hiccup "1.0.5"] [hiccup "1.0.5"]
[honeysql "0.7.0"] [honeysql "0.7.0"]
[luminus/ring-ttl-session "0.3.1"]
[mount "0.1.12"] [mount "0.1.12"]
[org.clojure/clojure "1.8.0"] [org.clojure/clojure "1.8.0"]
[org.clojure/clojurescript "1.8.51"] [org.clojure/clojurescript "1.8.51"]

23
src/mtgcoll/core.clj
View file

@ -6,12 +6,12 @@
[compojure.core :refer [routes GET POST]] [compojure.core :refer [routes GET POST]]
[compojure.route :as route] [compojure.route :as route]
[immutant.web :as immutant] [immutant.web :as immutant]
[immutant.web.middleware :refer [wrap-session]]
[mount.core :as mount :refer [defstate]] [mount.core :as mount :refer [defstate]]
[ring.middleware.defaults :refer [wrap-defaults site-defaults]] [ring.middleware.defaults :refer [wrap-defaults site-defaults]]
[ring.middleware.format :refer [wrap-restful-format]] [ring.middleware.format :refer [wrap-restful-format]]
[ring.middleware.reload :refer [wrap-reload]] [ring.middleware.reload :refer [wrap-reload]]
[ring.middleware.webjars :refer [wrap-webjars]] [ring.middleware.webjars :refer [wrap-webjars]]
[ring-ttl-session.core :refer [ttl-memory-store]]
[taoensso.sente.server-adapters.immutant :refer [sente-web-server-adapter]] [taoensso.sente.server-adapters.immutant :refer [sente-web-server-adapter]]
[mtgcoll.cli :as cli] [mtgcoll.cli :as cli]
[mtgcoll.config :as config] [mtgcoll.config :as config]
@ -26,18 +26,21 @@
[mtgcoll.routes.lists :refer [list-routes]] [mtgcoll.routes.lists :refer [list-routes]]
[mtgcoll.routes.auth :refer [auth-routes]])) [mtgcoll.routes.auth :refer [auth-routes]]))
(def app-routes
(routes
auth-routes
collection-routes
list-routes
image-routes
main-page-routes
(route/not-found "not found")))
(def handler (def handler
(-> (routes (-> #'app-routes
auth-routes
collection-routes
list-routes
image-routes
main-page-routes
(route/resources "/")
(route/not-found "not found"))
(wrap-restful-format :formats [:json-kw]) (wrap-restful-format :formats [:json-kw])
(sente/wrap-sente "/chsk") (sente/wrap-sente "/chsk")
(wrap-defaults (assoc-in site-defaults [:session :store] (ttl-memory-store (* 60 30)))) (wrap-defaults (assoc-in site-defaults [:session] false))
(wrap-session)
(wrap-webjars))) (wrap-webjars)))
(defstate ^{:on-reload :noop} http-server (defstate ^{:on-reload :noop} http-server

2
src/mtgcoll/views/core.clj
View file

@ -93,7 +93,7 @@
user-profile (get-in request [:session :user])] user-profile (get-in request [:session :user])]
(log/warn "Unauthorized view subscription attempt: " view-id ", " parameters " - user profile: " user-profile))) (log/warn "Unauthorized view subscription attempt: " view-id ", " parameters " - user profile: " user-profile)))
(defstate view-system (defstate ^{:on-reload :noop} view-system
:start (let [vs (atom nil)] :start (let [vs (atom nil)]
(vr/init! vs sente-socket (vr/init! vs sente-socket
{:views views {:views views

2
src/mtgcoll/views/sente.clj
View file

@ -4,7 +4,7 @@
[taoensso.sente :as sente] [taoensso.sente :as sente]
[taoensso.sente.server-adapters.immutant :refer [sente-web-server-adapter]])) [taoensso.sente.server-adapters.immutant :refer [sente-web-server-adapter]]))
(defstate sente-socket (defstate ^{:on-reload :noop} sente-socket
:start (sente/make-channel-socket! :start (sente/make-channel-socket!
sente-web-server-adapter sente-web-server-adapter
{:user-id-fn (fn [request] (get-in request [:params :client-id])) {:user-id-fn (fn [request] (get-in request [:params :client-id]))