VOL-2625 - fix SCA issues
Change-Id: If32cc66371f53040dc242679934a642a9488221a
diff --git a/internal/pkg/ofagent/ofagent.go b/internal/pkg/ofagent/ofagent.go
index 25041ab..c81fd58 100644
--- a/internal/pkg/ofagent/ofagent.go
+++ b/internal/pkg/ofagent/ofagent.go
@@ -130,11 +130,9 @@
case <-ctx.Done():
if volthaDone != nil {
volthaDone()
- volthaDone = nil
}
if hdlDone != nil {
hdlDone()
- hdlDone = nil
}
return
case event := <-ofa.events:
@@ -150,7 +148,12 @@
// Kick off process to attempt to establish
// connection to voltha
state = ofaStateConnecting
- go ofa.establishConnectionToVoltha(p)
+ go func() {
+ if err := ofa.establishConnectionToVoltha(p); err != nil {
+ logger.Errorw("voltha-connection-failed", log.Fields{"error": err})
+ panic(err)
+ }
+ }()
case ofaEventVolthaConnected:
logger.Debug("ofagent-voltha-connect-event")
@@ -194,11 +197,15 @@
}
volthaDone()
volthaDone = nil
- volthaCtx = nil
}
if state != ofaStateConnecting {
state = ofaStateConnecting
- go ofa.establishConnectionToVoltha(p)
+ go func() {
+ if err := ofa.establishConnectionToVoltha(p); err != nil {
+ log.Errorw("voltha-connection-failed", log.Fields{"error": err})
+ panic(err)
+ }
+ }()
}
case ofaEventError: