[VOL-2694] Use package specific logger instance in all log statements
Change-Id: Icf1cb5ade42e42179aed7731b767af2f52481e3d
diff --git a/tests/core/concurrency/core_concurrency_test.go b/tests/core/concurrency/core_concurrency_test.go
index c8ddff2..b5ab176 100644
--- a/tests/core/concurrency/core_concurrency_test.go
+++ b/tests/core/concurrency/core_concurrency_test.go
@@ -49,14 +49,6 @@
var devices map[string]*voltha.Device
func setup() {
- var err error
-
- if _, err = log.AddPackage(log.JSON, log.WarnLevel, log.Fields{"instanceId": "testing"}); err != nil {
- log.With(log.Fields{"error": err}).Fatal("Cannot setup logging")
- }
- log.UpdateAllLoggers(log.Fields{"instanceId": "testing"})
- log.SetAllLogLevel(log.ErrorLevel)
-
grpcPorts = []int{50057, 50058}
stubs = make([]voltha.VolthaServiceClient, 0)
conns = make([]*grpc.ClientConn, 0)
@@ -70,7 +62,7 @@
grpcHost := fmt.Sprintf("%s:%d", grpcHostIP, port)
conn, err := grpc.Dial(grpcHost, grpc.WithInsecure())
if err != nil {
- log.Fatalf("did not connect: %s", err)
+ logger.Fatalf("did not connect: %s", err)
return nil, errors.New("failure-to-connect")
}
conns = append(conns, conn)
@@ -82,7 +74,7 @@
for _, port := range grpcPorts {
if client, err := connectToCore(port); err == nil {
stubs = append(stubs, client)
- log.Infow("connected", log.Fields{"port": port})
+ logger.Infow("connected", log.Fields{"port": port})
}
}
return stubs
@@ -92,7 +84,7 @@
for key, _ := range devices {
ctx := context.Background()
response, err := stubs[1].DeleteDevice(ctx, &voltha.ID{Id: key})
- log.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow("response", log.Fields{"res": response, "error": err})
if clearMap {
delete(devices, key)
}
@@ -120,7 +112,7 @@
command := "docker-compose"
cmd := exec.Command(command, "-f", "../../../compose/docker-compose-zk-kafka-test.yml", "up", "-d")
if err := cmd.Run(); err != nil {
- log.Fatal(err)
+ logger.Fatal(err)
}
}
@@ -129,7 +121,7 @@
command := "docker-compose"
cmd := exec.Command(command, "-f", "../../../compose/docker-compose-etcd.yml", "up", "-d")
if err := cmd.Run(); err != nil {
- log.Fatal(err)
+ logger.Fatal(err)
}
}
@@ -140,7 +132,7 @@
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
- log.Warn(err)
+ logger.Warn(err)
}
}
@@ -151,7 +143,7 @@
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
- log.Warn(err)
+ logger.Warn(err)
}
}
@@ -160,7 +152,7 @@
command := "docker-compose"
cmd := exec.Command(command, "-f", "../../../compose/rw_core_concurrency_test.yml", "up", "-d")
if err := cmd.Run(); err != nil {
- log.Fatal(err)
+ logger.Fatal(err)
}
}
@@ -171,7 +163,7 @@
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
- log.Warn(err)
+ logger.Warn(err)
}
}
@@ -180,7 +172,7 @@
command := "docker-compose"
cmd := exec.Command(command, "-f", "../../../compose/adapters-simulated.yml", "up", "-d")
if err := cmd.Run(); err != nil {
- log.Fatal(err)
+ logger.Fatal(err)
}
}
@@ -191,7 +183,7 @@
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
- log.Warn(err)
+ logger.Warn(err)
}
}
@@ -350,7 +342,7 @@
//3. Create the devices
response, err := createDevice(stubs)
- log.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow("response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
devices[response.Id] = response