From ed0deed5a3b0843862450fbc8e01a2c3fb3d09f8 Mon Sep 17 00:00:00 2001 From: leandrofars Date: Sat, 8 Jun 2024 11:42:36 -0300 Subject: [PATCH] feat(cwmp): logs formatting and switch --- backend/services/acs/internal/bridge/bridge.go | 11 +++++------ backend/services/acs/internal/server/handler/cwmp.go | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/backend/services/acs/internal/bridge/bridge.go b/backend/services/acs/internal/bridge/bridge.go index aa67db8..9c7ed27 100644 --- a/backend/services/acs/internal/bridge/bridge.go +++ b/backend/services/acs/internal/bridge/bridge.go @@ -44,9 +44,11 @@ func NewBridge( func (b *Bridge) StartBridge() { b.sub(handler.NATS_CWMP_ADAPTER_SUBJECT_PREFIX+"*.api", func(msg *nats.Msg) { - //log.Printf("Received message: %s", string(msg.Data)) - log.Printf("Subject: %s", msg.Subject) - log.Printf("Reply: %s", msg.Reply) + if b.conf.DebugMode { + log.Printf("Received message: %s", string(msg.Data)) + log.Printf("Subject: %s", msg.Subject) + log.Printf("Reply: %s", msg.Reply) + } device := getDeviceFromSubject(msg.Subject) cpe, ok := b.cpes[device] @@ -81,9 +83,6 @@ func (b *Bridge) StartBridge() { return } - //req := cpe.Queue.Dequeue().(handler.Request) - //cpe.Waiting = &req - defer cpe.Queue.Dequeue() select { diff --git a/backend/services/acs/internal/server/handler/cwmp.go b/backend/services/acs/internal/server/handler/cwmp.go index 0d23c6a..4deb85c 100644 --- a/backend/services/acs/internal/server/handler/cwmp.go +++ b/backend/services/acs/internal/server/handler/cwmp.go @@ -104,7 +104,7 @@ func (h *Handler) CwmpHandler(w http.ResponseWriter, r *http.Request) { if cpe.Waiting != nil { - log.Println("CPE was waiting for a response, now received something") + log.Println("ACS was waiting for a response from the CPE, now received something") var e cwmp.SoapEnvelope xml.Unmarshal([]byte(body), &e) @@ -122,7 +122,7 @@ func (h *Handler) CwmpHandler(w http.ResponseWriter, r *http.Request) { log.Println(body) } else { log.Println("Unknown message type") - log.Println("Envelope:", e) + log.Println("Body:", body) msgAnswer(cpe.Waiting.Callback, cpe.Waiting.Time, h.acsConfig.DeviceAnswerTimeout, tmp) } cpe.Waiting = nil