diff options
Diffstat (limited to 'core/channel.go')
| -rw-r--r-- | core/channel.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/core/channel.go b/core/channel.go index 2e73917..c464708 100644 --- a/core/channel.go +++ b/core/channel.go @@ -21,8 +21,9 @@ import ( "strings" "time" - "git.fd.io/govpp.git/api" "github.com/sirupsen/logrus" + + "git.fd.io/govpp.git/api" ) var ( @@ -144,6 +145,7 @@ func (ch *Channel) SendMultiRequest(msg api.Message) api.MultiRequestCtx { func (ch *Channel) CheckCompatiblity(msgs ...api.Message) error { for _, msg := range msgs { + // TODO: collect all incompatible messages and return summarized error _, err := ch.msgIdentifier.GetMessageID(msg) if err != nil { return err @@ -255,17 +257,23 @@ func (ch *Channel) receiveReplyInternal(msg api.Message, expSeqNum uint16) (last case vppReply := <-ch.replyChan: ignore, lastReplyReceived, err = ch.processReply(vppReply, expSeqNum, msg) if ignore { - logrus.Warnf("ignoring reply: %+v", vppReply) + logrus.WithFields(logrus.Fields{ + "expSeqNum": expSeqNum, + "channel": ch.id, + }).Warnf("ignoring received reply: %+v (expecting: %s)", vppReply, msg.GetMessageName()) continue } return lastReplyReceived, err case <-timer.C: + logrus.WithFields(logrus.Fields{ + "expSeqNum": expSeqNum, + "channel": ch.id, + }).Debugf("timeout (%v) waiting for reply: %s", ch.replyTimeout, msg.GetMessageName()) err = fmt.Errorf("no reply received within the timeout period %s", ch.replyTimeout) return false, err } } - return } func (ch *Channel) processReply(reply *vppReply, expSeqNum uint16, msg api.Message) (ignore bool, lastReplyReceived bool, err error) { |