From 50ebef35c490b1aea414d16b09676165b00317fe Mon Sep 17 00:00:00 2001 From: gered Date: Mon, 25 Jan 2016 16:08:19 -0500 Subject: [PATCH] take out the ring-custom-jetty-server stuff was intended for some browserchannel stuff where jetty-async was needed, but i'm probably going to be moving on to websockets / httpkit for my own personal projects now anyway, so definitely don't need this in the meantime. --- src/leiningen/new/yawt/project.clj | 1 - src/leiningen/new/yawt/src/root_ns/core.clj | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/leiningen/new/yawt/project.clj b/src/leiningen/new/yawt/project.clj index c1665e5..3100300 100644 --- a/src/leiningen/new/yawt/project.clj +++ b/src/leiningen/new/yawt/project.clj @@ -8,7 +8,6 @@ :dependencies [[org.clojure/clojure "1.8.0"] [compojure "1.4.0"] [metosin/ring-http-response "0.6.5"] - [ring-custom-jetty-server "0.1.0"] [ring-server "0.4.0"] [ring/ring-defaults "0.1.5" :exclusions [javax.servlet/servlet-api]] [ring-middleware-format "0.7.0"] diff --git a/src/leiningen/new/yawt/src/root_ns/core.clj b/src/leiningen/new/yawt/src/root_ns/core.clj index b9e92d2..7bf2c90 100644 --- a/src/leiningen/new/yawt/src/root_ns/core.clj +++ b/src/leiningen/new/yawt/src/root_ns/core.clj @@ -4,7 +4,7 @@ [compojure.core :refer [defroutes routes]] [compojure.route :as route] [clojure.tools.logging :refer [info]] - [ring-custom-jetty.server.standalone :refer [serve]] + [ring.server.standalone :refer [serve]] [ring.adapter.jetty :refer [run-jetty]] [ring.middleware.defaults :refer [wrap-defaults site-defaults]] [ring.middleware.format :refer [wrap-restful-format]] @@ -81,8 +81,7 @@ server (serve (get-handler) - {:run-server-fn run-jetty - :port port + {:port port :init init :auto-reload? (env :dev) :destroy destroy