From fd2e4cc23cfb21d0a0bc4ea2afa645542964473b Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Tue, 10 May 2016 01:24:47 -0400 Subject: [PATCH] Exchange ad-hoc tracing for slightly more principled log-info output. --- racket/syndicate/broker/protocol.rkt | 3 --- racket/syndicate/broker/server.rkt | 14 ++++++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/racket/syndicate/broker/protocol.rkt b/racket/syndicate/broker/protocol.rkt index e538c13..d7011a0 100644 --- a/racket/syndicate/broker/protocol.rkt +++ b/racket/syndicate/broker/protocol.rkt @@ -59,9 +59,6 @@ [(? patch? p) `("patch" ,(patch->jsexpr p (lambda (v) #t)))] [(message body) `("message" ,body)]))) -(require racket/trace) -(trace drop lift) - (define drop-json-action drop) (define lift-json-event lift) (define lift-json-action lift) diff --git a/racket/syndicate/broker/server.rkt b/racket/syndicate/broker/server.rkt index 9f04893..e4cf043 100644 --- a/racket/syndicate/broker/server.rkt +++ b/racket/syndicate/broker/server.rkt @@ -35,6 +35,7 @@ (arm-ping-timer!) + (log-info "\nStarting broker connection from ~v" c) (until (retracted (advertise (websocket-message c server-id _)) #:meta-level 1) (assert (advertise (websocket-message server-id c _)) #:meta-level 1) @@ -46,14 +47,19 @@ (match (drop-json-action (string->jsexpr data)) ['ping (send-event 'pong)] ['pong (void)] - [(? patch? p) (patch! (patch-without-at-meta p))] + [(? patch? p) (patch! (log-packet c 'inbound 'patch (patch-without-at-meta p)))] [(message (at-meta _)) (void)] - [(message body) (send! body)])) + [(message body) (send! (log-packet c 'inbound 'message body))])) (on-event - [(? patch? p) (send-event (clean-patch p))] + [(? patch? p) (send-event (log-packet c 'outbound 'patch (clean-patch p)))] [(message (at-meta _)) #f] - [(? message? m) (send-event m)])))) + [(message body) (send-event (message (log-packet c 'outbound 'message body)))])) + (log-info "\nEnding broker connection from ~v" c))) + +(define (log-packet c direction kind value) + (log-info "\nBroker: ~v: ~a ~a\n~v" c direction kind value) + value) (define stuff-to-prune (trie-union-all #:combiner (lambda (v1 v2) (trie-success #t))