diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/channel.go | 14 | ||||
| -rw-r--r-- | core/connection.go | 8 | ||||
| -rw-r--r-- | core/request_handler.go | 6 |
3 files changed, 18 insertions, 10 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) { diff --git a/core/connection.go b/core/connection.go index 02f980a..605e1ef 100644 --- a/core/connection.go +++ b/core/connection.go @@ -30,8 +30,8 @@ import ( ) const ( - DefaultReconnectInterval = time.Second // default interval between reconnect attempts - DefaultMaxReconnectAttempts = 3 // default maximum number of reconnect attempts + DefaultReconnectInterval = time.Second / 2 // default interval between reconnect attempts + DefaultMaxReconnectAttempts = 3 // default maximum number of reconnect attempts ) var ( @@ -255,7 +255,7 @@ func (c *Connection) releaseAPIChannel(ch *Channel) { // connectLoop attempts to connect to VPP until it succeeds. // Then it continues with healthCheckLoop. func (c *Connection) connectLoop(connChan chan ConnectionEvent) { - reconnectAttempts := 0 + var reconnectAttempts int // loop until connected for { @@ -268,7 +268,7 @@ func (c *Connection) connectLoop(connChan chan ConnectionEvent) { break } else if reconnectAttempts < c.maxAttempts { reconnectAttempts++ - log.Errorf("connecting failed (attempt %d/%d): %v", reconnectAttempts, c.maxAttempts, err) + log.Warnf("connecting failed (attempt %d/%d): %v", reconnectAttempts, c.maxAttempts, err) time.Sleep(c.recInterval) } else { connChan <- ConnectionEvent{Timestamp: time.Now(), State: Failed, Error: err} diff --git a/core/request_handler.go b/core/request_handler.go index fd8aa59..d3f7bdc 100644 --- a/core/request_handler.go +++ b/core/request_handler.go @@ -93,7 +93,7 @@ func (c *Connection) processRequest(ch *Channel, req *vppRequest) error { "msg_size": len(data), "seq_num": req.seqNum, "msg_crc": req.msg.GetCrcString(), - }).Debugf("--> govpp send: %s: %+v", req.msg.GetMessageName(), req.msg) + }).Debugf("==> govpp send: %s: %+v", req.msg.GetMessageName(), req.msg) } // send the request to VPP @@ -118,7 +118,7 @@ func (c *Connection) processRequest(ch *Channel, req *vppRequest) error { "msg_id": c.pingReqID, "msg_size": len(pingData), "seq_num": req.seqNum, - }).Debug(" -> sending control ping") + }).Debug("--> sending control ping") if err := c.vppClient.SendMsg(context, pingData); err != nil { log.WithFields(logger.Fields{ @@ -165,7 +165,7 @@ func (c *Connection) msgCallback(msgID uint16, data []byte) { "is_multi": isMulti, "seq_num": seqNum, "msg_crc": msg.GetCrcString(), - }).Debugf("<-- govpp recv: %s", msg.GetMessageName()) + }).Debugf("<== govpp recv: %s", msg.GetMessageName()) } if context == 0 || c.isNotificationMessage(msgID) { |