Skip to content

Commit

Permalink
moved wrap-reload to middleware
Browse files Browse the repository at this point in the history
  • Loading branch information
yogthos committed Jul 13, 2015
1 parent ca02d89 commit 277cd7e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
17 changes: 7 additions & 10 deletions src/leiningen/new/luminus/core/src/handler.clj
@@ -1,8 +1,7 @@
(ns <<project-ns>>.handler
(:require [compojure.core :refer [defroutes routes wrap-routes]]
[ring.middleware.reload :as reload]
[<<project-ns>>.routes.home :refer [home-routes]]
<<service-required>>
[<<project-ns>>.routes.home :refer [home-routes]]<% if service-required %>
<<service-required>><% endif %>
[<<project-ns>>.middleware :as middleware]
[<<project-ns>>.session :as session]
[compojure.route :as route]
Expand Down Expand Up @@ -67,11 +66,9 @@
(timbre/info "shutdown complete!"))

(def app-base
(-> (routes<% if service-routes %>
<<service-routes>><% endif %>
(wrap-routes #'home-routes middleware/wrap-csrf)
#'base-routes)
middleware/wrap-base))
(routes<% if service-routes %>
<<service-routes>><% endif %>
(wrap-routes #'home-routes middleware/wrap-csrf)
#'base-routes))

(def app
(if (env :dev) (reload/wrap-reload #'app-base) app-base))
(def app (middleware/wrap-base #'app-base))
2 changes: 2 additions & 0 deletions src/leiningen/new/luminus/core/src/middleware.clj
Expand Up @@ -7,6 +7,7 @@
[selmer.middleware :refer [wrap-error-page]]
[prone.middleware :refer [wrap-exceptions]]
[ring.util.response :refer [redirect]]
[ring.middleware.reload :as reload]
[ring.middleware.defaults :refer [site-defaults wrap-defaults]]
[ring.middleware.anti-forgery :refer [wrap-anti-forgery]]
[ring.middleware.session-timeout :refer [wrap-idle-session-timeout]]
Expand Down Expand Up @@ -39,6 +40,7 @@
(defn wrap-dev [handler]
(if (env :dev)
(-> handler
reload/wrap-reload
wrap-error-page
wrap-exceptions)
handler))
Expand Down

0 comments on commit 277cd7e

Please sign in to comment.