reorganize to more closely match my other templates
i just like this other layout better
This commit is contained in:
parent
32cbb2f34f
commit
f694ca675b
|
@ -1,4 +1,4 @@
|
||||||
(defproject net.gered/lein-template.simple-web-service "0.3.0-SNAPSHOT"
|
(defproject net.gered/lein-template.simple-web-service "0.2.3-SNAPSHOT"
|
||||||
:description "Simple Clojure web service project template."
|
:description "Simple Clojure web service project template."
|
||||||
:url "https://github.com/gered/simple-web-service-template"
|
:url "https://github.com/gered/simple-web-service-template"
|
||||||
:license {:name "MIT License"
|
:license {:name "MIT License"
|
||||||
|
|
|
@ -22,10 +22,55 @@
|
||||||
[ring.util.http-response :refer :all]
|
[ring.util.http-response :refer :all]
|
||||||
[schema.core :as s]))
|
[schema.core :as s]))
|
||||||
|
|
||||||
(declare config)
|
(declare handler)
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; TODO: other app stuff goes here ...
|
;; infrastructure components
|
||||||
|
;;
|
||||||
|
|
||||||
|
(defstate ^{:on-reload :noop} config
|
||||||
|
:start
|
||||||
|
(do
|
||||||
|
(log/info "Loading config.edn")
|
||||||
|
(load-config :file "config.edn")))
|
||||||
|
|
||||||
|
(defstate ^{:on-reload :noop} repl-server
|
||||||
|
:start
|
||||||
|
(let [{:keys [port bind]
|
||||||
|
:or {port 7000
|
||||||
|
bind "127.0.0.1"}} (:nrepl config)
|
||||||
|
server (nrepl/start-server :port port :bind bind)]
|
||||||
|
(log/info (format "Starting nREPL server listening on %s:%d" bind port))
|
||||||
|
server)
|
||||||
|
:stop
|
||||||
|
(when repl-server
|
||||||
|
(log/info "Stopping nREPL server")
|
||||||
|
(nrepl/stop-server repl-server)))
|
||||||
|
|
||||||
|
(defstate ^{:on-reload :noop} http-server
|
||||||
|
:start
|
||||||
|
(let [{:keys [port bind]
|
||||||
|
:or {port 8080
|
||||||
|
bind "0.0.0.0"}} (:http config)
|
||||||
|
server (http-kit/run-server
|
||||||
|
(as-> #'handler h
|
||||||
|
(if (:dev? config) (wrap-reload h) h))
|
||||||
|
{:port port
|
||||||
|
:ip bind
|
||||||
|
:server-header nil
|
||||||
|
:legacy-return-value? false})]
|
||||||
|
(log/info (format "Started HTTP server listening on %s:%d" bind port))
|
||||||
|
server)
|
||||||
|
:stop
|
||||||
|
(when http-server
|
||||||
|
(log/info "Stopping HTTP server")
|
||||||
|
(http-kit/server-stop! http-server)
|
||||||
|
nil))
|
||||||
|
|
||||||
|
|
||||||
|
;;
|
||||||
|
;; web middleware
|
||||||
;;
|
;;
|
||||||
|
|
||||||
; example exception handler that logs all unhandled exceptions thrown by your routes
|
; example exception handler that logs all unhandled exceptions thrown by your routes
|
||||||
|
@ -48,6 +93,11 @@
|
||||||
(handler request)
|
(handler request)
|
||||||
(unauthorized "unauthorized!")))))
|
(unauthorized "unauthorized!")))))
|
||||||
|
|
||||||
|
|
||||||
|
;;
|
||||||
|
;; main web handler
|
||||||
|
;;
|
||||||
|
|
||||||
(defstate handler
|
(defstate handler
|
||||||
:start
|
:start
|
||||||
(ring/ring-handler
|
(ring/ring-handler
|
||||||
|
@ -143,47 +193,6 @@
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
(defstate ^{:on-reload :noop} config
|
|
||||||
:start
|
|
||||||
(do
|
|
||||||
(log/info "Loading config.edn")
|
|
||||||
(load-config :file "config.edn")))
|
|
||||||
|
|
||||||
(defstate ^{:on-reload :noop} repl-server
|
|
||||||
:start
|
|
||||||
(let [{:keys [port bind]
|
|
||||||
:or {port 7000
|
|
||||||
bind "127.0.0.1"}} (:nrepl config)
|
|
||||||
server (nrepl/start-server :port port :bind bind)]
|
|
||||||
(log/info (format "Starting nREPL server listening on %s:%d" bind port))
|
|
||||||
server)
|
|
||||||
:stop
|
|
||||||
(when repl-server
|
|
||||||
(log/info "Stopping nREPL server")
|
|
||||||
(nrepl/stop-server repl-server)))
|
|
||||||
|
|
||||||
(defstate ^{:on-reload :noop} http-server
|
|
||||||
:start
|
|
||||||
(let [{:keys [port bind]
|
|
||||||
:or {port 8080
|
|
||||||
bind "0.0.0.0"}} (:http config)
|
|
||||||
server (http-kit/run-server
|
|
||||||
(as-> #'handler h
|
|
||||||
(if (:dev? config) (wrap-reload h) h))
|
|
||||||
{:port port
|
|
||||||
:ip bind
|
|
||||||
:server-header nil
|
|
||||||
:legacy-return-value? false})]
|
|
||||||
(log/info (format "Started HTTP server listening on %s:%d" bind port))
|
|
||||||
server)
|
|
||||||
:stop
|
|
||||||
(when http-server
|
|
||||||
(log/info "Stopping HTTP server")
|
|
||||||
(http-kit/server-stop! http-server)
|
|
||||||
nil))
|
|
||||||
|
|
||||||
;;
|
|
||||||
|
|
||||||
(defn -main
|
(defn -main
|
||||||
[& args]
|
[& args]
|
||||||
(log/info "<%name%> is starting up ...")
|
(log/info "<%name%> is starting up ...")
|
||||||
|
|
Loading…
Reference in a new issue