From 0b57de255730e7277bd5fbd96d78f64b2961c553 Mon Sep 17 00:00:00 2001
From: Ondrej Fabry <ofabry@cisco.com>
Date: Tue, 21 May 2019 11:30:20 +0200
Subject: Change default adapter to socketclient and cleanup some logs

Change-Id: I16ae8dbb5214e022304f4e8ae60798b370567fc8
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
---
 adapter/socketclient/socketclient.go | 22 ++++++++++------------
 govpp.go                             |  9 +++++----
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/adapter/socketclient/socketclient.go b/adapter/socketclient/socketclient.go
index 2b67645..c80af36 100644
--- a/adapter/socketclient/socketclient.go
+++ b/adapter/socketclient/socketclient.go
@@ -165,19 +165,18 @@ func (c *vppClient) Connect() error {
 }
 
 func (c *vppClient) connect(sockAddr string) error {
-	addr, err := net.ResolveUnixAddr("unixpacket", sockAddr)
-	if err != nil {
-		Log.Debugln("ResolveUnixAddr error:", err)
-		return err
-	}
+	addr := &net.UnixAddr{Name: sockAddr, Net: "unix"}
 
 	conn, err := net.DialUnix("unix", nil, addr)
 	if err != nil {
+		// we try different type of socket for backwards compatbility with VPP<=19.04
 		if strings.Contains(err.Error(), "wrong type for socket") {
+			addr.Net = "unixpacket"
+			Log.Debugf("%s, retrying connect with type unixpacket", err)
 			conn, err = net.DialUnix("unixpacket", nil, addr)
 		}
 		if err != nil {
-			Log.Debugln("Dial error:", err)
+			Log.Debugf("Connecting to socket %s failed: %s", addr, err)
 			return err
 		}
 	}
@@ -276,7 +275,7 @@ func (c *vppClient) Disconnect() error {
 	}
 
 	if err := c.conn.Close(); err != nil {
-		Log.Debugln("Close socket conn failed:", err)
+		Log.Debugln("Closing socket failed:", err)
 		return err
 	}
 
@@ -297,7 +296,7 @@ func (c *vppClient) close() error {
 	// set non-0 context
 	msg[5] = deleteMsgContext
 
-	Log.Debugf("sending socklntDel (%d byes): % 0X\n", len(msg), msg)
+	Log.Debugf("sending socklntDel (%d byes): % 0X", len(msg), msg)
 	if err := c.write(msg); err != nil {
 		Log.Debugln("Write error: ", err)
 		return err
@@ -397,7 +396,7 @@ func (c *vppClient) write(msg []byte) error {
 		if x > len(msg) {
 			x = len(msg)
 		}
-		Log.Debugf("x=%v i=%v len=%v mod=%v\n", x, i, len(msg), len(msg)/c.writer.Size())
+		Log.Debugf("x=%v i=%v len=%v mod=%v", x, i, len(msg), len(msg)/c.writer.Size())
 		if n, err := c.writer.Write(msg[i*c.writer.Size() : x]); err != nil {
 			return err
 		} else {
@@ -419,10 +418,10 @@ type msgHeader struct {
 
 func (c *vppClient) readerLoop() {
 	defer c.wg.Done()
+	defer Log.Debugf("reader quit")
 	for {
 		select {
 		case <-c.quit:
-			Log.Debugf("reader quit")
 			return
 		default:
 		}
@@ -432,7 +431,7 @@ func (c *vppClient) readerLoop() {
 			if isClosedError(err) {
 				return
 			}
-			Log.Debugf("READ FAILED: %v", err)
+			Log.Debugf("read failed: %v", err)
 			continue
 		}
 		h := new(msgHeader)
@@ -491,7 +490,6 @@ func (c *vppClient) read() ([]byte, error) {
 		view := msg[n:]
 
 		for remain > 0 {
-
 			nbytes, err := c.reader.Read(view)
 			if err != nil {
 				return nil, err
diff --git a/govpp.go b/govpp.go
index d66d5dc..f36ce40 100644
--- a/govpp.go
+++ b/govpp.go
@@ -15,10 +15,11 @@
 package govpp
 
 import (
+	"time"
+
 	"git.fd.io/govpp.git/adapter"
-	"git.fd.io/govpp.git/adapter/vppapiclient"
+	"git.fd.io/govpp.git/adapter/socketclient"
 	"git.fd.io/govpp.git/core"
-	"time"
 )
 
 var (
@@ -26,9 +27,9 @@ var (
 	vppAdapter adapter.VppAPI
 )
 
-func getVppAdapter(shm string) adapter.VppAPI {
+func getVppAdapter(addr string) adapter.VppAPI {
 	if vppAdapter == nil {
-		vppAdapter = vppapiclient.NewVppClient(shm)
+		vppAdapter = socketclient.NewVppClient(addr)
 	}
 	return vppAdapter
 }
-- 
cgit 1.2.3-korg