[VOL-2612] Remove error log when returning error from methods
Change-Id: If07af8337a55e0d5d729fc76092590f697ee8276
diff --git a/cmd/openolt-adapter/main.go b/cmd/openolt-adapter/main.go
index 2f7b235..79ce363 100644
--- a/cmd/openolt-adapter/main.go
+++ b/cmd/openolt-adapter/main.go
@@ -128,14 +128,13 @@
a.eventProxy = com.NewEventProxy(com.MsgClient(a.kafkaClient), com.MsgTopic(kafka.Topic{Name: a.config.EventTopic}))
// Create the open OLT adapter
- if a.iAdapter, err = a.startOpenOLT(ctx, a.kip, a.coreProxy, a.adapterProxy, a.eventProxy,
- a.config); err != nil {
- log.Fatal("error-starting-inter-container-proxy")
+ if a.iAdapter, err = a.startOpenOLT(ctx, a.kip, a.coreProxy, a.adapterProxy, a.eventProxy, a.config); err != nil {
+ log.Fatalw("error-starting-openolt", log.Fields{"error": err})
}
// Register the core request handler
if err = a.setupRequestHandler(ctx, a.instanceID, a.iAdapter); err != nil {
- log.Fatal("error-setting-core-request-handler")
+ log.Fatalw("error-setting-core-request-handler", log.Fields{"error": err})
}
// Register this adapter to the Core - retries indefinitely
@@ -356,7 +355,6 @@
sOLT := ac.NewOpenOLT(ctx, a.kip, cp, ap, ep, cfg)
if err = sOLT.Start(ctx); err != nil {
- log.Fatalw("error-starting-messaging-proxy", log.Fields{"error": err})
return nil, err
}
@@ -368,7 +366,6 @@
log.Info("setting-request-handler")
requestProxy := com.NewRequestHandlerProxy(coreInstanceID, iadapter, a.coreProxy)
if err := a.kip.SubscribeWithRequestHandlerInterface(kafka.Topic{Name: a.config.Topic}, requestProxy); err != nil {
- log.Errorw("request-handler-setup-failed", log.Fields{"error": err})
return err
}