Skip to content
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.

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

add nginx-clojure support #160

Merged
merged 3 commits into from
Sep 3, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 1 addition & 0 deletions example-project/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
;;; ---> Choose (uncomment) a supported web server <---
[http-kit "2.1.19"]
;; [org.immutant/web "2.0.2"]
;; [nginx-clojure/nginx-clojure-embed "0.4.2"]

[ring "1.4.0"]
[ring/ring-defaults "0.1.5"] ; Includes `ring-anti-forgery`, etc.
Expand Down
12 changes: 12 additions & 0 deletions example-project/src/example/my_app.cljx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@

;; [immutant.web :as immutant]
;; [taoensso.sente.server-adapters.immutant :refer (sente-web-server-adapter)]

;; [nginx.clojure.embed :as nginx-clojure]
;; [taoensso.sente.server-adapters.nginx-clojure :refer (sente-web-server-adapter)]

;; Optional, for Transit encoding:
[taoensso.sente.packers.transit :as sente-transit])
Expand Down Expand Up @@ -86,6 +89,15 @@
;; :port (:port server)
;; :stop-fn (fn [] (immutant/stop server))}))

;;; nginx-clojure embeded
;; #+clj
;; (defn start-web-server!* [ring-handler port]
;; (println "Starting nginx-clojure...")
;; (let [port (nginx-clojure/run-server ring-handler {:port port})]
;; {:server nil ; nginx-clojure doesn't expose this
;; :port port
;; :stop-fn nginx-clojure/stop-server}))

;;;; Packer (client<->server serializtion format) config

(def packer (sente-transit/get-flexi-packer :edn)) ; Experimental, needs Transit dep
Expand Down
1 change: 1 addition & 0 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
;;
[http-kit "2.1.19"]
[org.immutant/web "2.0.0"]
[nginx-clojure "0.4.2"]
;;
[lein-pprint "1.1.1"]
[lein-ancient "0.6.7"]
Expand Down
36 changes: 36 additions & 0 deletions src/taoensso/sente/server_adapters/nginx_clojure.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
(ns taoensso.sente.server-adapters.nginx-clojure
"Experimental- subject to change!
Optional Nginx-Clojure v0.4.2+ adapter for use with Sente."
(:require [taoensso.sente.interfaces :as i]
[nginx.clojure.core :as ncc]))

(def ^:dynamic *max-message-size* nginx.clojure.WholeMessageAdapter/DEFAULT_MAX_MESSAGE_SIZE)

(extend-type nginx.clojure.NginxHttpServerChannel
i/IAsyncNetworkChannel
(open? [nc-ch] (not (ncc/closed? nc-ch)))
(close! [nc-ch] (ncc/close! nc-ch))
(send!* [nc-ch msg close-after-send?]
(let [closed? (ncc/closed? nc-ch)]
(ncc/send! nc-ch msg true (boolean close-after-send?))
(not closed?))))

(deftype NginxClojureAsyncNetworkChannelAdapter []
i/IAsyncNetworkChannelAdapter
(ring-req->net-ch-resp [net-ch-adapter ring-req callbacks-map]
(let [{:keys [on-open on-msg on-close]} callbacks-map
nc-ch (ncc/hijack! ring-req true)
upgrade-ok? (ncc/websocket-upgrade! nc-ch false)]
;; Returns {:status 200 :body <nginx-clojure-implementation-channel>}:
(when (not upgrade-ok?) ;; send general header for non-websocket request
(.setIgnoreFilter nc-ch false)
(ncc/send-header! nc-ch 200 {"Content-Type" "text/html"} false false))
(ncc/add-aggregated-listener! nc-ch *max-message-size*
{:on-open (when on-open (fn [nc-ch] (on-open nc-ch)))
:on-error nil ;;Do we need/want this?
:on-message (when on-msg (fn [nc-ch msg] (on-msg nc-ch msg)))
:on-close (when on-close (fn [nc-ch reason] (on-close nc-ch reason)))})
{:status 200 :body nc-ch})))

(def nginx-clojure-adapter (NginxClojureAsyncNetworkChannelAdapter.))
(def sente-web-server-adapter nginx-clojure-adapter) ; Alias for ns import convenience
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No carriage return at end of file

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danielcompton Thank you! I have added a newline.