From acf626cd573ee03604a48ec8c40cb96eec517994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Diedrich?= Date: Tue, 23 Jun 2020 17:38:08 +0200 Subject: [PATCH] we're jetty now + env stuff --- project.clj | 4 +++- src/clojsa/handler.clj | 11 +++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 9396708..5f1c9bd 100644 --- a/project.clj +++ b/project.clj @@ -4,9 +4,11 @@ :min-lein-version "2.0.0" :dependencies [[org.clojure/clojure "1.10.0"] [compojure "1.6.1"] + [ring/ring-jetty-adapter "1.7.1"] [ring/ring-defaults "0.3.2"] [http.async.client "1.3.1"] - [hickory "0.7.1"]] + [hickory "0.7.1"] + [environ "1.1.0"]] :plugins [[lein-ring "0.12.5"]] :ring {:handler clojsa.handler/app} :uberjar-name "clojsa-standalone.jar" diff --git a/src/clojsa/handler.clj b/src/clojsa/handler.clj index 81fd306..7276062 100644 --- a/src/clojsa/handler.clj +++ b/src/clojsa/handler.clj @@ -7,7 +7,9 @@ [compojure.coercions :refer [as-int]] [ring.middleware.defaults :refer [wrap-defaults site-defaults]] [ring.middleware.session :refer [wrap-session]] - [ring.middleware.session.cookie :refer (cookie-store)])) + [ring.middleware.session.cookie :refer (cookie-store)] + [ring.adapter.jetty :as jetty] + [environ.core :refer [env]])) (defn get-thread [session id page] @@ -54,4 +56,9 @@ (-> app-routes (wrap-defaults site-defaults) (wrap-session {:cookie-attrs {:max-age (* 7 24 3600)} - :store (cookie-store {:key "699a7e4bd79b3f56"})}))) + :store (cookie-store {:key (or (env :cskey) + "699a7e4bd79b3f56")})}))) + +(defn -main [& [port]] + (let [port (Integer. (or port (env :port) 5000))] + (jetty/run-jetty app {:port port :join? false})))