Skip to content

Commit

Permalink
Whitespace, organization
Browse files Browse the repository at this point in the history
  • Loading branch information
camdez committed Jul 26, 2017
1 parent 648ba6b commit bd8c84e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
12 changes: 6 additions & 6 deletions src/rente/client/ws.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@
(js/console.log "PUSHed :rente/testevent from server: %s " (pr-str event)))

(defmulti event-msg-handler :id) ; Dispatch on event-id
;; Wrap for logging, catching, etc.:

(defmethod event-msg-handler :default ; Fallback
[{:as ev-msg :keys [event]}]
(js/console.log "Unhandled event: %s" (pr-str event)))
[{:as ev-msg :keys [event]}]
(js/console.log "Unhandled event: %s" (pr-str event)))

(defmethod event-msg-handler :chsk/state
[{[_old-ev-msg new-ev-msg] :?data, :as ev-msg}]
Expand All @@ -25,6 +24,7 @@
[{:as ev-msg :keys [?data]}]
(push-msg-handler ?data))

;; Wrap for logging, catching, etc.:
(defn event-msg-handler* [{:as ev-msg :keys [id ?data event]}]
(event-msg-handler ev-msg))

Expand All @@ -40,9 +40,9 @@

(defn test-socket-callback []
(chsk-send!
[:rente/testevent {:message "Hello socket Callback!"}]
2000
#(js/console.log "CALLBACK from server: " (pr-str %))))
[:rente/testevent {:message "Hello socket Callback!"}]
2000
#(js/console.log "CALLBACK from server: " (pr-str %))))

(defn test-socket-event []
(chsk-send! [:rente/testevent {:message "Hello socket Event!"}]))
13 changes: 7 additions & 6 deletions src/rente/ws.clj
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@
(def ping-counts (atom 0))

(defmulti event-msg-handler :id) ; Dispatch on event-id
;; Wrap for logging, catching, etc.:
(defn event-msg-handler* [{:as ev-msg :keys [id ?data event]}]
(event-msg-handler ev-msg))

(defmethod event-msg-handler :chsk/ws-ping
[_]
(swap! ping-counts inc)
(when (= 0 (mod @ping-counts 10))
(println "ping counts: " @ping-counts)))
(swap! ping-counts inc)
(when (= 0 (mod @ping-counts 10))
(println "ping counts: " @ping-counts)))

(defmethod event-msg-handler :rente/testevent
[{:as ev-msg :keys [event id ?data ring-req ?reply-fn send-fn]}]
Expand All @@ -33,6 +30,10 @@
(when ?reply-fn
(?reply-fn {:umatched-event-as-echoed-from-from-server event}))))

;; Wrap for logging, catching, etc.:
(defn event-msg-handler* [{:as ev-msg :keys [id ?data event]}]
(event-msg-handler ev-msg))

(defrecord WSRingHandlers [ajax-post-fn ajax-get-or-ws-handshake-fn])

(defrecord WSConnection [ch-recv connected-uids send-fn ring-handlers]
Expand Down

0 comments on commit bd8c84e

Please sign in to comment.