Skip to content

next #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

next #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{:deps {org.clojure/clojure {:mvn/version "1.10.3"}
org.eclipse.jetty/jetty-server {:mvn/version "11.0.6"}
org.eclipse.jetty.http2/http2-server {:mvn/version "11.0.6"}
org.eclipse.jetty/jetty-alpn-server {:mvn/version "11.0.6"}
org.eclipse.jetty.websocket/websocket-jetty-server {:mvn/version "11.0.6"}
{:deps {org.clojure/clojure {:mvn/version "1.11.0-rc1"}
org.eclipse.jetty/jetty-server {:mvn/version "11.0.8"}
org.eclipse.jetty.http2/http2-server {:mvn/version "11.0.8"}
org.eclipse.jetty/jetty-alpn-server {:mvn/version "11.0.8"}
org.eclipse.jetty.websocket/websocket-jetty-server {:mvn/version "11.0.8"}
exoscale/interceptor {:mvn/version "0.1.9"}
cc.qbits/auspex {:mvn/version "1.0.0-alpha7"}
cc.qbits/auspex {:mvn/version "1.0.0-alpha8"}
org.clojure/tools.logging {:mvn/version "1.1.0"}}

:paths ["src"]
Expand All @@ -27,5 +27,5 @@
:sha "b4359c5d67ca002d9ed0c4b41b710d7e5a82e3bf"}}
:exec-fn deps-deploy.deps-deploy/deploy
:exec-args {:installer :remote
;; :artifact "target/eddy-1.0.0-alpha18.jar"
:artifact "target/eddy-1.0.0-alpha19.jar"
:pom-file "target/classes/META-INF/maven/com.s-exp/eddy/pom.xml"}}}}
55 changes: 27 additions & 28 deletions src/s_exp/eddy/http/server.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,16 @@
[clojure.tools.logging :as log])

(:import
(jakarta.servlet.http HttpServletResponse
HttpServletRequest)
(org.eclipse.jetty.server Server
Request
Response
HttpConnectionFactory
SslConnectionFactory
SecureRequestCustomizer
ServerConnector
HttpConfiguration
HttpConnectionFactory
ConnectionFactory)
(org.eclipse.jetty.server Server
Request
Response
HttpConnectionFactory
SslConnectionFactory
SecureRequestCustomizer
ServerConnector
HttpConfiguration
HttpConnectionFactory
ConnectionFactory)
(org.eclipse.jetty.alpn.server ALPNServerConnectionFactory)
(org.eclipse.jetty.http2.server HTTP2CServerConnectionFactory HTTP2ServerConnectionFactory)
(org.eclipse.jetty.server.handler AbstractHandler)
Expand All @@ -34,29 +32,29 @@
(merge
#:s-exp.eddy.http.server{:join? true}
#:s-exp.eddy.http.server.interceptor{:chain ring1/chain
:ctx {}}
:ctx {}}
#:s-exp.eddy.http.server.threadpool{:daemon? false
:max-threads 50
:min-threads 8
:max-queued-requests Integer/MAX_VALUE
:idle-timeout 60000}
:max-threads 50
:min-threads 8
:max-queued-requests Integer/MAX_VALUE
:idle-timeout 60000}
#:s-exp.eddy.http.server.http-config{:secure-scheme "https"
:output-buffer-size 32768
:request-header-size 8192
:response-header-size 8192
:send-server-version? false
:send-date-header? false
:header-cache-size 512}
:output-buffer-size 32768
:request-header-size 8192
:response-header-size 8192
:send-server-version? false
:send-date-header? false
:header-cache-size 512}
#:s-exp.eddy.http.server.http-connector{:port 8080
:max-idle-time 200000}
:max-idle-time 200000}
#:s-exp.eddy.http.server.ssl-connector{:max-idle-time 200000}
#:s-exp.eddy.ssl-context-factory{}))

(defn initial-context
[ctx request response]
(into ctx
#:s-exp.eddy.http.server{:request request
:response response}))
:response response}))

(defn create-handler
[f]
Expand Down Expand Up @@ -88,8 +86,8 @@
(defn- create-threadpool
^ThreadPool
[{:s-exp.eddy.http.server.threadpool/keys [max-threads min-threads
idle-timeout daemon?
max-queued-requests]}]
idle-timeout daemon?
max-queued-requests]}]
(let [queue-max-capacity (max max-queued-requests 8)
queue-capacity (min (max min-threads 8)
queue-max-capacity)
Expand Down Expand Up @@ -144,6 +142,7 @@
:need (.setNeedClientAuth context-server true)
:want (.setWantClientAuth context-server true)
nil)

(when-let [exclude-ciphers exclude-ciphers]
(let [ciphers (into-array String exclude-ciphers)]
(if replace-exclude-ciphers?
Expand All @@ -160,7 +159,7 @@
^ServerConnector
[^Server server factories]
(ServerConnector. server
#^"[Lorg.eclipse.jetty.server.ConnectionFactory;"
^"[Lorg.eclipse.jetty.server.ConnectionFactory;"
(into-array ConnectionFactory factories)))

(defn- ^ServerConnector ssl-connector
Expand Down