louis/oktopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(cwmp): logs formatting and switch

Browse Source
This commit is contained in:
leandrofars 2024-06-08 11:42:36 -03:00
parent 19bcf9c01a
commit ed0deed5a3
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/services/acs/internal/bridge/bridge.go
View File

@ -44,9 +44,11 @@ func NewBridge(
func (b *Bridge) StartBridge() { func (b *Bridge) StartBridge() {
b.sub(handler.NATS_CWMP_ADAPTER_SUBJECT_PREFIX+"*.api", func(msg *nats.Msg) { b.sub(handler.NATS_CWMP_ADAPTER_SUBJECT_PREFIX+"*.api", func(msg *nats.Msg) {
//log.Printf("Received message: %s", string(msg.Data)) if b.conf.DebugMode {
log.Printf("Subject: %s", msg.Subject) log.Printf("Received message: %s", string(msg.Data))
log.Printf("Reply: %s", msg.Reply) log.Printf("Subject: %s", msg.Subject)
log.Printf("Reply: %s", msg.Reply)
}
device := getDeviceFromSubject(msg.Subject) device := getDeviceFromSubject(msg.Subject)
cpe, ok := b.cpes[device] cpe, ok := b.cpes[device]
@ -81,9 +83,6 @@ func (b *Bridge) StartBridge() {
return return
} }
//req := cpe.Queue.Dequeue().(handler.Request)
//cpe.Waiting = &req
defer cpe.Queue.Dequeue() defer cpe.Queue.Dequeue()
select { select {

4
backend/services/acs/internal/server/handler/cwmp.go
View File

@ -104,7 +104,7 @@ func (h *Handler) CwmpHandler(w http.ResponseWriter, r *http.Request) {
if cpe.Waiting != nil { 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 var e cwmp.SoapEnvelope
xml.Unmarshal([]byte(body), &e) xml.Unmarshal([]byte(body), &e)
@ -122,7 +122,7 @@ func (h *Handler) CwmpHandler(w http.ResponseWriter, r *http.Request) {
log.Println(body) log.Println(body)
} else { } else {
log.Println("Unknown message type") log.Println("Unknown message type")
log.Println("Envelope:", e) log.Println("Body:", body)
msgAnswer(cpe.Waiting.Callback, cpe.Waiting.Time, h.acsConfig.DeviceAnswerTimeout, tmp) msgAnswer(cpe.Waiting.Callback, cpe.Waiting.Time, h.acsConfig.DeviceAnswerTimeout, tmp)
} }
cpe.Waiting = nil cpe.Waiting = nil