gered/clj-browserchannel
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add trace log output to clj-browserchannel

Browse source
This commit is contained in:
Gered 2016-05-13 12:39:13 -04:00
parent 63a74707fa
commit 5056d14d3a
4 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -15,5 +15,8 @@ pom.xml.asc
*.iml *.iml
*.ipr *.ipr
*.iws *.iws
repl/
repl-resources/
profiles.clj
/chat-demo/resources/public/cljs /chat-demo/resources/public/cljs

4
chat-demo/resources/logback.xml
View file

@ -6,7 +6,11 @@
</encoder> </encoder>
</appender> </appender>
<!-- these are just to remove some "chatty" logging output, especially for DEBUG and lower.
you don't necessarily need this yourself -->
<logger name="org.eclipse.jetty" level="INFO"/> <logger name="org.eclipse.jetty" level="INFO"/>
<logger name="org.xnio" level="INFO"/>
<logger name="io.undertow" level="INFO"/>
<root level="${ROOT_LEVEL:-INFO}"> <root level="${ROOT_LEVEL:-INFO}">
<appender-ref ref="R"/> <appender-ref ref="R"/>

3
clj-browserchannel/project.clj
View file

@ -1,6 +1,7 @@
(defproject gered/clj-browserchannel "0.3" (defproject gered/clj-browserchannel "0.3"
:description "BrowserChannel server implementation in Clojure, with a ClojureScript wrapper for the BrowserChannel API included in Google Closure." :description "BrowserChannel server implementation in Clojure, with a ClojureScript wrapper for the BrowserChannel API included in Google Closure."
:dependencies [[ring/ring-core "1.4.0"] :dependencies [[org.clojure/tools.logging "0.3.1"]
[ring/ring-core "1.4.0"]
[cheshire "5.6.1"] [cheshire "5.6.1"]
[prismatic/dommy "1.1.0"]] [prismatic/dommy "1.1.0"]]
:profiles {:provided :profiles {:provided

21
clj-browserchannel/src/net/thegeez/browserchannel/server.clj
View file

@ -3,6 +3,7 @@
(:import (:import
[java.util.concurrent ScheduledExecutorService Executors TimeUnit Callable ScheduledFuture]) [java.util.concurrent ScheduledExecutorService Executors TimeUnit Callable ScheduledFuture])
(:require (:require
[clojure.tools.logging :as log]
[clojure.edn :as edn] [clojure.edn :as edn]
[cheshire.core :as json] [cheshire.core :as json]
[ring.middleware.params :as params] [ring.middleware.params :as params]
@ -110,10 +111,9 @@
:body (str "<html><body><h1>" message "</h1></body></html>")}) :body (str "<html><body><h1>" message "</h1></body></html>")})
(defn- agent-error-handler-fn (defn- agent-error-handler-fn
"Prints the error and tries to restart the agent."
[id] [id]
(fn [ag ^Exception e] (fn [ag e]
(println "ERROR:" id "agent threw" e (.getMessage e)))) (log/error e (str id " agent exception."))))
(defn- to-pair (defn- to-pair
[p] [p]
@ -382,6 +382,7 @@
ISession ISession
(clear-back-channel [this] (clear-back-channel [this]
(log/trace id ": clear-back-channel" (if back-channel "(existing back-channel)" ""))
(try (try
(when back-channel (when back-channel
(write-end (:respond back-channel))) (write-end (:respond back-channel)))
@ -394,6 +395,7 @@
refresh-session-timeout)) refresh-session-timeout))
(set-back-channel [this respond req] (set-back-channel [this respond req]
(log/trace id ": set-back-channel")
(let [bc (BackChannel. respond (let [bc (BackChannel. respond
;; can we stream responses ;; can we stream responses
;; back? ;; back?
@ -416,12 +418,14 @@
(clear-heartbeat [this] (clear-heartbeat [this]
(when heartbeat-timeout (when heartbeat-timeout
(log/trace id ": clear-heartbeat")
(.cancel ^ScheduledFuture heartbeat-timeout (.cancel ^ScheduledFuture heartbeat-timeout
false ;; do not interrupt running tasks false ;; do not interrupt running tasks
)) ))
(assoc this :heartbeat-timeout nil)) (assoc this :heartbeat-timeout nil))
(refresh-heartbeat [this] (refresh-heartbeat [this]
(log/trace id ": refresh-heartbeat")
(-> this (-> this
clear-heartbeat clear-heartbeat
(assoc :heartbeat-timeout (assoc :heartbeat-timeout
@ -437,25 +441,30 @@
(clear-session-timeout [this] (clear-session-timeout [this]
(when session-timeout (when session-timeout
(log/trace id ": clear-session-timeout")
(.cancel ^ScheduledFuture session-timeout (.cancel ^ScheduledFuture session-timeout
false ;; do not interrupt running tasks false ;; do not interrupt running tasks
)) ))
(assoc this :session-timeout nil)) (assoc this :session-timeout nil))
(refresh-session-timeout [this] (refresh-session-timeout [this]
(log/trace id ": refresh-session-timeout")
(-> this (-> this
clear-session-timeout clear-session-timeout
(assoc :session-timeout (assoc :session-timeout
(let [session-agent *agent*] (let [session-agent *agent*]
(schedule (schedule
(fn [] (fn []
(log/trace id ": session timed out")
(send-off session-agent close nil "Timed out")) (send-off session-agent close nil "Timed out"))
(:session-timeout-interval details)))))) (:session-timeout-interval details))))))
(queue-string [this json-string] (queue-string [this json-string]
(log/trace id ": queue-string" (pr-str json-string))
(update-in this [:array-buffer] queue json-string)) (update-in this [:array-buffer] queue json-string))
(acknowledge-arrays [this array-id-str] (acknowledge-arrays [this array-id-str]
(log/trace id ": acknowledge-arrays" array-id-str)
(let [array-id (Long/parseLong array-id-str)] (let [array-id (Long/parseLong array-id-str)]
(update-in this [:array-buffer] acknowledge-id array-id))) (update-in this [:array-buffer] acknowledge-id array-id)))
@ -463,11 +472,13 @@
;; @todo the composition is a bit awkward in this method due to the ;; @todo the composition is a bit awkward in this method due to the
;; try catch and if mix ;; try catch and if mix
(flush-buffer [this] (flush-buffer [this]
(log/trace id ": flush-buffer" (if-not back-channel "(no back-channel)" ""))
(if-not back-channel (if-not back-channel
this ;; nothing to do when there's no connection this ;; nothing to do when there's no connection
;; only flush unacknowledged arrays ;; only flush unacknowledged arrays
(if-let [[to-flush next-array-buffer] (to-flush array-buffer)] (if-let [[to-flush next-array-buffer] (to-flush array-buffer)]
(try (try
(log/trace id ": flushing" (count to-flush) "arrays")
;; buffer contains [[1 json-str] ...] can't use ;; buffer contains [[1 json-str] ...] can't use
;; json-str which will double escape the json ;; json-str which will double escape the json
@ -491,6 +502,7 @@
;; make a new heartbeat ;; make a new heartbeat
(refresh-heartbeat this)) (refresh-heartbeat this))
(catch Exception e (catch Exception e
(log/trace e id ": exception during flush")
;; when write failed ;; when write failed
;; non delivered arrays are still in buffer ;; non delivered arrays are still in buffer
(clear-back-channel this) (clear-back-channel this)
@ -500,6 +512,7 @@
;; closes the session and removes it from sessions ;; closes the session and removes it from sessions
(close [this request message] (close [this request message]
(log/trace id ": close" (if message (str "(message: " message ")") ""))
(-> this (-> this
clear-back-channel clear-back-channel
clear-session-timeout clear-session-timeout
@ -521,6 +534,7 @@
;; when a client specifies and old session id then that old one ;; when a client specifies and old session id then that old one
;; needs to be removed ;; needs to be removed
(when-let [old-session-agent (@sessions old-session-id)] (when-let [old-session-agent (@sessions old-session-id)]
(log/trace old-session-id ": old session reconnect")
(send-off old-session-agent #(-> (if old-array-id (send-off old-session-agent #(-> (if old-array-id
(acknowledge-arrays % old-array-id) (acknowledge-arrays % old-array-id)
%) %)
@ -548,6 +562,7 @@
nil ;; session-timeout nil ;; session-timeout
) )
session-agent (agent session)] session-agent (agent session)]
(log/trace id ": new session created" (if old-session-id (str "(old session id: " old-session-id ")") ""))
(set-error-handler! session-agent (agent-error-handler-fn (str "session-" (:id session)))) (set-error-handler! session-agent (agent-error-handler-fn (str "session-" (:id session))))
(set-error-mode! session-agent :continue) (set-error-mode! session-agent :continue)
;; add new session-agent to our list of active browserchannel sessions ;; add new session-agent to our list of active browserchannel sessions