Improved error logging for debugging

Change-Id: I89356e55da779a0ad1e22b4752b625b330355c33
Signed-off-by: Juha Hyttinen <juha.hyttinen@nokia.com>

diff --git a/e2ap/pkg/packer/packer.go b/e2ap/pkg/packer/packer.go
index e36af8b..63c0c2f 100644 (file)
--- a/e2ap/pkg/packer/packer.go
+++ b/e2ap/pkg/packer/packer.go
@@ -46,8 +46,7 @@ func PduPackerPack(entry PduPackerIf, trgBuf *PackedData) error {
        if err == nil {
                return nil
        }
-       reterr := fmt.Errorf("Pack failed: %s", err.Error())
-
+       reterr := fmt.Errorf("Pack failed: err: %s, logbuffer: %s", err.Error(), string(logBuffer[:]))
        //reterr = fmt.Errorf("%s: PDU:%s", reterr.Error(), string(logBuffer))
        return reterr
 }
@@ -80,8 +79,7 @@ func PduPackerUnPack(entry PduUnPackerIf, data *PackedData) error {
        if err == nil {
                return nil
        }
-       reterr := fmt.Errorf("Unpack failed: %s", logBuffer)
-
+       reterr := fmt.Errorf("Unpack failed: err: %s, logbuffer: %s", err.Error(), string(logBuffer[:]))
        //reterr = fmt.Errorf("%s: PDU:%s", reterr.Error(), string(logBuffer))
        return reterr
 }

diff --git a/pkg/control/control.go b/pkg/control/control.go
index 52571aa..ef27530 100755 (executable)
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -265,7 +265,7 @@ func (c *Control) handleSubscriptionResponse(params *RMRParams) {
        //
        SubRespMsg, err := c.e2ap.UnpackSubscriptionResponse(params.Payload)
        if err != nil {
-               xapp.Logger.Error("SubDelReq: %s Dropping this msg. %s", err.Error(), params.String())
+               xapp.Logger.Error("SubResp: %s Dropping this msg. %s", err.Error(), params.String())
                return
        }
 

diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go
index 30f1ef2..f564c48 100644 (file)
--- a/pkg/control/e2ap.go
+++ b/pkg/control/e2ap.go
@@ -27,6 +27,8 @@ package control
 import "C"
 
 import (
+       "encoding/hex"
+       "fmt"
        "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
        "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap_wrapper"
        "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/packer"
@@ -47,11 +49,11 @@ func (c *E2ap) UnpackSubscriptionRequest(payload []byte) (*e2ap.E2APSubscription
        packedData.Buf = payload
        err := e2SubReq.UnPack(packedData)
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        err, subReq := e2SubReq.Get()
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        return subReq, nil
 }
@@ -78,11 +80,11 @@ func (c *E2ap) UnpackSubscriptionResponse(payload []byte) (*e2ap.E2APSubscriptio
        packedData.Buf = payload
        err := e2SubResp.UnPack(packedData)
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        err, subResp := e2SubResp.Get()
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        return subResp, nil
 }
@@ -109,11 +111,11 @@ func (c *E2ap) UnpackSubscriptionFailure(payload []byte) (*e2ap.E2APSubscription
        packedData.Buf = payload
        err := e2SubFail.UnPack(packedData)
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        err, subFail := e2SubFail.Get()
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        return subFail, nil
 }
@@ -140,11 +142,11 @@ func (c *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscr
        packedData.Buf = payload
        err := e2SubDelReq.UnPack(packedData)
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        err, subDelReq := e2SubDelReq.Get()
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        return subDelReq, nil
 }
@@ -171,11 +173,11 @@ func (c *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubsc
        packedData.Buf = payload
        err := e2SubDelResp.UnPack(packedData)
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        err, subDelResp := e2SubDelResp.Get()
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        return subDelResp, nil
 }
@@ -202,11 +204,11 @@ func (c *E2ap) UnpackSubscriptionDeleteFailure(payload []byte) (*e2ap.E2APSubscr
        packedData.Buf = payload
        err := e2SubDelFail.UnPack(packedData)
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        err, subDelFail := e2SubDelFail.Get()
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("%s buf[%s]", err.Error(), hex.EncodeToString(payload))
        }
        return subDelFail, nil
 }