[VOL-3069]Pass Context in methods which are performing logging and need the context
Change-Id: Ie84f9e240aa4f47d0046acaac0d82d21b17252e5
diff --git a/internal/pkg/core/olt_state_transitions.go b/internal/pkg/core/olt_state_transitions.go
index cd6df1d..58e2251 100644
--- a/internal/pkg/core/olt_state_transitions.go
+++ b/internal/pkg/core/olt_state_transitions.go
@@ -149,7 +149,7 @@
// Check whether the transtion is valid from current state
if !tMap.isValidTransition(trigger) {
- logger.Errorw("invalid-transition-triggered",
+ logger.Errorw(ctx, "invalid-transition-triggered",
log.Fields{
"current-state": tMap.currentDeviceState,
"trigger": trigger})
@@ -159,31 +159,31 @@
// Invoke the before handlers
beforeHandlers := tMap.transitions[trigger].before
if beforeHandlers == nil {
- logger.Debugw("no-handlers-for-before", log.Fields{"trigger": trigger})
+ logger.Debugw(ctx, "no-handlers-for-before", log.Fields{"trigger": trigger})
}
for _, handler := range beforeHandlers {
- logger.Debugw("running-before-handler", log.Fields{"handler": funcName(handler)})
+ logger.Debugw(ctx, "running-before-handler", log.Fields{"handler": funcName(handler)})
if err := handler(ctx); err != nil {
// TODO handle error
- logger.Error(err)
+ logger.Error(ctx, err)
return
}
}
// Update the state
tMap.currentDeviceState = tMap.transitions[trigger].currentState
- logger.Debugw("updated-device-state ", log.Fields{"current-device-state": tMap.currentDeviceState})
+ logger.Debugw(ctx, "updated-device-state ", log.Fields{"current-device-state": tMap.currentDeviceState})
// Invoke the after handlers
afterHandlers := tMap.transitions[trigger].after
if afterHandlers == nil {
- logger.Debugw("no-handlers-for-after", log.Fields{"trigger": trigger})
+ logger.Debugw(ctx, "no-handlers-for-after", log.Fields{"trigger": trigger})
}
for _, handler := range afterHandlers {
- logger.Debugw("running-after-handler", log.Fields{"handler": funcName(handler)})
+ logger.Debugw(ctx, "running-after-handler", log.Fields{"handler": funcName(handler)})
if err := handler(ctx); err != nil {
// TODO handle error
- logger.Error(err)
+ logger.Error(ctx, err)
return
}
}