diff options
Diffstat (limited to 'ebus-racket/ebus')
| -rw-r--r-- | ebus-racket/ebus/layer2.rkt | 17 | ||||
| -rw-r--r-- | ebus-racket/ebus/layer7.rkt | 14 |
2 files changed, 12 insertions, 19 deletions
diff --git a/ebus-racket/ebus/layer2.rkt b/ebus-racket/ebus/layer2.rkt index 192f7f5..3141452 100644 --- a/ebus-racket/ebus/layer2.rkt +++ b/ebus-racket/ebus/layer2.rkt @@ -2,8 +2,7 @@ (require racket/bool (planet bzlib/parseq:1:3)) -(define logger (make-logger 'ebus-layer2 (current-logger))) -(current-logger logger) +(define-logger ebus2) ;; Ebus SYN (define ebus-const-syn #xaa) @@ -84,16 +83,13 @@ (define (read-ebus input-port) (define syn ((make-reader ebus-sync #:sof? #f #:eof? #f) input-port)) (define paket ((make-reader parse-ebus-paket #:sof? #f #:eof? #f) input-port)) - (cond ((not (false? syn)) - (log-debug "drop ~s x SYN (~s)" syn ebus-const-syn))) - (cond ((not (false? paket)) - paket) - ((eof-object? (peek-byte input-port)) - eof) + (cond ((not (false? syn)) (log-ebus2-debug "dropped ~a x SYN (~a)" syn ebus-const-syn))) + (cond ((not (false? paket)) paket) + ((eof-object? (peek-byte input-port)) eof) (else ;; skip one byte (let ([byte (read-byte input-port)]) - (log-debug "drop ~s 0x~x" byte byte)) + (log-ebus2-debug "drop ~s 0x~x" byte byte)) (read-ebus input-port)))) (provide @@ -102,5 +98,4 @@ (prefix-out layer2- (struct-out ebus-paket)) (prefix-out layer2- (struct-out ebus-body-broadcast)) (prefix-out layer2- (struct-out ebus-body-mastermaster)) - (prefix-out layer2- (struct-out ebus-body-masterslave)) - (prefix-out layer2- logger)) + (prefix-out layer2- (struct-out ebus-body-masterslave))) diff --git a/ebus-racket/ebus/layer7.rkt b/ebus-racket/ebus/layer7.rkt index 60f8bbc..76ea6ae 100644 --- a/ebus-racket/ebus/layer7.rkt +++ b/ebus-racket/ebus/layer7.rkt @@ -6,8 +6,7 @@ "xexpr-path/main.rkt" "layer2.rkt") -(define logger (make-logger 'ebus-layer7 (current-logger))) -(current-logger logger) +(define-logger ebus7) (define definition (parameterize ([collapse-whitespace #t] @@ -17,7 +16,7 @@ (define (paket ebus-paket) (define primaryCommand (number->string (layer2-ebus-paket-primaryCommand ebus-paket))) (define secondaryCommand (number->string (layer2-ebus-paket-secondaryCommand ebus-paket))) - (log-debug "Lookup paket primaryCommand=~a secondaryCommand=~a" primaryCommand secondaryCommand) + (log-ebus7-debug "Lookup paket primaryCommand=~a secondaryCommand=~a" primaryCommand secondaryCommand) (xexpr-path-first (list 'packets 'packet (list 'primary primaryCommand) (list 'secondary secondaryCommand)) definition)) @@ -46,7 +45,7 @@ (define payload (layer2-ebus-paket-payload ebus-paket)) (for/list ([decoder decoders]) (decoder payload))) - (else (void (log-info "Unknown Paket from source ~s(~s): ~s" + (else (void (log-ebus7-info "Unknown Paket from source ~s(~s): ~s" (layer2-ebus-paket-source ebus-paket) source-device-name ebus-paket))))) @@ -57,7 +56,7 @@ (define name (string-append paket-id "." (xexpr-path-first '((name)) field))) (define offset (string->number (xexpr-path-first '((offset)) field))) (define decoder (hash-ref decoder-table type #f)) - (cond ((false? decoder) (void (log-warning "No decoder for type ~s" type))) + (cond ((false? decoder) (void (log-ebus7-warning "No decoder for type ~s" type))) (else (curry (car decoder) name field offset)))) (define decoder-table @@ -168,6 +167,5 @@ (prefix-out layer7- device) (prefix-out layer7- device-name) (prefix-out layer7- definition) - ;; read ebus from port an return fields from next paket - (prefix-out layer7- read-ebus) - (prefix-out layer7- logger)) + ;; read ebus from port an return fields from next paket + (prefix-out layer7- read-ebus)) |