VOL-3419: Replicate voltha flows in openolt agent
- The scale-tester-app will adhere to new openolt.proto interface (version 4.0.2)
and will pass necessary information for openolt-agent to replicate the flows.
- upgrade to voltha-lib-go version 4.0.0
Change-Id: I9d862929ae8ac4468d4e93096f8cd8e16f26ec93
diff --git a/main.go b/main.go
index 7a22df3..7b45bcb 100644
--- a/main.go
+++ b/main.go
@@ -28,11 +28,18 @@
"github.com/opencord/openolt-scale-tester/core"
"github.com/opencord/openolt-scale-tester/config"
- "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ "github.com/opencord/voltha-lib-go/v4/pkg/log"
)
+var logger log.CLogger
+
func init() {
- _, _ = log.AddPackage(log.JSON, log.DebugLevel, nil)
+ // Setup this package so that it's log level can be modified at run time
+ var err error
+ logger, err = log.RegisterPackage(log.JSON, log.DebugLevel, log.Fields{})
+ if err != nil {
+ panic(err)
+ }
}
const (
@@ -63,10 +70,10 @@
syscall.SIGINT,
syscall.SIGTERM,
syscall.SIGQUIT:
- log.Infow("closing-signal-received", log.Fields{"signal": s})
+ logger.Infow(nil, "closing-signal-received", log.Fields{"signal": s})
exitChannel <- 0
default:
- log.Infow("unexpected-signal-received", log.Fields{"signal": s})
+ logger.Infow(nil, "unexpected-signal-received", log.Fields{"signal": s})
exitChannel <- 1
}
}()
@@ -97,23 +104,23 @@
// Setup default logger - applies for packages that do not have specific logger set
if _, err := log.SetDefaultLogger(log.JSON, 0, log.Fields{"instanceId": 0}); err != nil {
- log.With(log.Fields{"error": err}).Fatal("Cannot setup logging")
+ logger.With(log.Fields{"error": err}).Fatal(nil, "Cannot setup logging")
}
// Update all loggers (provisioned via init) with a common field
if err := log.UpdateAllLoggers(log.Fields{"instanceId": 0}); err != nil {
- log.With(log.Fields{"error": err}).Fatal("Cannot setup logging")
+ logger.With(log.Fields{"error": err}).Fatal(nil, "Cannot setup logging")
}
- log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/v3/pkg/adapters/common", log.DebugLevel)
+ log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/v4/pkg/adapters/common", log.DebugLevel)
- log.Infow("config", log.Fields{"config": *cf})
+ logger.Infow(nil, "config", log.Fields{"config": *cf})
go sc.openOltManager.Start(cf)
code := waitForExit()
- log.Infow("received-a-closing-signal", log.Fields{"code": code})
+ logger.Infow(nil, "received-a-closing-signal", log.Fields{"code": code})
elapsed := time.Since(start)
- log.Infow("run-time", log.Fields{"instanceId": 0, "time": elapsed / time.Second})
+ logger.Infow(nil, "run-time", log.Fields{"instanceId": 0, "time": elapsed / time.Second})
}