unifying edgemesh component logging library to klog

Signed-off-by: zhangjie <iamkadisi@163.com>

10 files changed, 66 insertions, 46 deletions

diff --git a/edgemesh/cmd/edgemesh.go b/edgemesh/cmd/edgemesh.go
index a278ea4e4..053372d76 100644
--- a/edgemesh/cmd/edgemesh.go
+++ b/edgemesh/cmd/edgemesh.go
@@ -1,11 +1,16 @@
 package main
 
 import (
+	"flag"
+
 	"github.com/go-chassis/go-chassis/control"
 	"github.com/go-chassis/go-chassis/core/config"
 	"github.com/go-chassis/go-chassis/core/loadbalancer"
 	"github.com/go-chassis/go-chassis/core/registry"
 	"github.com/kubeedge/kubeedge/edgemesh/pkg"
+	"github.com/spf13/pflag"
+	"k8s.io/klog"
+
 	_ "github.com/kubeedge/kubeedge/edgemesh/pkg/panel"
 	edgeregistry "github.com/kubeedge/kubeedge/edgemesh/pkg/registry"
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/resolver"
@@ -13,6 +18,10 @@ import (
 )
 
 func main() {
+	klog.InitFlags(nil)
+	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
+	pflag.Parse()
+
 	//Initialize the resolvers
 	r := &resolver.MyResolver{"http"}
 	resolver.RegisterResolver(r)
diff --git a/edgemesh/pkg/module.go b/edgemesh/pkg/module.go
index a4468f8cc..3d11d0e46 100644
--- a/edgemesh/pkg/module.go
+++ b/edgemesh/pkg/module.go
@@ -1,7 +1,8 @@
 package pkg
 
 import (
-	"github.com/kubeedge/beehive/pkg/common/log"
+	"k8s.io/klog"
+
 	"github.com/kubeedge/beehive/pkg/core"
 	"github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/kubeedge/edge/pkg/common/modules"
@@ -36,7 +37,7 @@ func (em *EdgeMesh) Start(c *context.Context) {
 	// we need watch message to update the cache of instances
 	for {
 		if msg, ok := em.context.Receive(constant.ModuleNameEdgeMesh); ok == nil {
-			log.LOGGER.Infof("get message: %v", msg)
+			klog.Infof("get message: %v", msg)
 			continue
 		}
 	}
diff --git a/edgemesh/pkg/registry/registry.go b/edgemesh/pkg/registry/registry.go
index 2eab41f5f..d24b02e38 100644
--- a/edgemesh/pkg/registry/registry.go
+++ b/edgemesh/pkg/registry/registry.go
@@ -6,11 +6,12 @@ import (
 
 	"github.com/go-chassis/go-chassis/core/registry"
 	utiltags "github.com/go-chassis/go-chassis/pkg/util/tags"
-	"github.com/kubeedge/beehive/pkg/common/log"
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/klog"
+
 	"github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/common"
-	v1 "k8s.io/api/core/v1"
 )
 
 const (
@@ -57,7 +58,7 @@ func (r *ServiceDiscovery) FindMicroServiceInstances(consumerID, microServiceNam
 
 	pods, err := r.metaClient.Services(namespace).GetPods(name)
 	if err != nil {
-		log.LOGGER.Errorf("get service pod list failed, error: %v", err)
+		klog.Errorf("get service pod list failed, error: %v", err)
 		return nil, err
 	}
 	var microServiceInstance []*registry.MicroServiceInstance
diff --git a/edgemesh/pkg/resolver/resolver.go b/edgemesh/pkg/resolver/resolver.go
index 0f38ae932..011983519 100644
--- a/edgemesh/pkg/resolver/resolver.go
+++ b/edgemesh/pkg/resolver/resolver.go
@@ -7,9 +7,10 @@ import (
 	"net/http"
 	"strings"
 
-	mconfig "github.com/kubeedge/beehive/pkg/common/config"
 	"github.com/go-chassis/go-chassis/core/invocation"
-	"github.com/kubeedge/beehive/pkg/common/log"
+	"k8s.io/klog"
+
+	mconfig "github.com/kubeedge/beehive/pkg/common/config"
 )
 
 type Resolver interface {
@@ -68,6 +69,6 @@ func (resolver *MyResolver) Resolve(data chan []byte, stop chan interface{}, inv
 			invCallback(protocol, i)
 			return i, true
 		}
-		log.LOGGER.Infof("content: %s\n", content)
+		klog.Infof("content: %s\n", content)
 	}
 }
diff --git a/edgemesh/pkg/resolver/resolver_chain_test.go b/edgemesh/pkg/resolver/resolver_chain_test.go
index a7f470ff1..54a23a975 100644
--- a/edgemesh/pkg/resolver/resolver_chain_test.go
+++ b/edgemesh/pkg/resolver/resolver_chain_test.go
@@ -6,7 +6,8 @@ import (
 	"time"
 
 	"github.com/go-chassis/go-chassis/core/invocation"
-	"github.com/kubeedge/beehive/pkg/common/log"
+	"k8s.io/klog"
+
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/resolver"
 )
 
@@ -37,7 +38,7 @@ func (resolver *TestResolver) Resolve(data chan []byte, stop chan interface{}, i
 			invCallback(protocol, i)
 			return i, true
 		}
-		log.LOGGER.Infof("content: %s\n", content)
+		klog.Infof("content: %s\n", content)
 	}
 }
 
@@ -48,8 +49,8 @@ func TestResolve(t *testing.T) {
 	resolver.RegisterResolver(r1)
 	resolver.RegisterResolver(r2)
 	invCallback := func(protocol string, inv invocation.Invocation) {
-		log.LOGGER.Infof("protocol in invCallback:%v", protocol)
-		log.LOGGER.Infof("content in invCallback: %v\n", inv.Args)
+		klog.Infof("protocol in invCallback:%v", protocol)
+		klog.Infof("content in invCallback: %v\n", inv.Args)
 	}
 	d := make(chan []byte, 1024)
 	s := make(chan interface{}, 1)
diff --git a/edgemesh/pkg/server/dns.go b/edgemesh/pkg/server/dns.go
index d419c5f6b..35b45fb56 100644
--- a/edgemesh/pkg/server/dns.go
+++ b/edgemesh/pkg/server/dns.go
@@ -11,7 +11,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/kubeedge/beehive/pkg/common/log"
+	"k8s.io/klog"
+
 	"github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/common"
@@ -81,7 +82,7 @@ func startDnsServer() {
 	//get DNS server name
 	lip, err := getIP()
 	if err != nil {
-		log.LOGGER.Errorf("Dns server Start error : %s", err)
+		klog.Errorf("Dns server Start error : %s", err)
 		return
 	}
 
@@ -92,14 +93,14 @@ func startDnsServer() {
 	udpConn, err := net.ListenUDP("udp", laddr)
 	defer udpConn.Close()
 	if err != nil {
-		log.LOGGER.Errorf("Dns server Start error : %s", err)
+		klog.Errorf("Dns server Start error : %s", err)
 	}
 	dnsConn = udpConn
 	for {
 		req := make([]byte, bufSize)
 		n, from, err := dnsConn.ReadFromUDP(req)
 		if err != nil || n <= 0 {
-			log.LOGGER.Infof("DNS server get an IO error : %s", err)
+			klog.Infof("DNS server get an IO error : %s", err)
 			continue
 		}
 
@@ -113,7 +114,7 @@ func startDnsServer() {
 		rsp := make([]byte, 0)
 		rsp, err = recordHandler(que, req[0:n])
 		if err != nil {
-			log.LOGGER.Infof("DNS server get an resolve abnormal : %s", err)
+			klog.Infof("DNS server get an resolve abnormal : %s", err)
 			continue
 		}
 		dnsConn.WriteTo(rsp, from)
@@ -258,10 +259,10 @@ func lookupFromMetaManager(serviceUrl string) (exist bool, err error) {
 	name, namespace := common.SplitServiceKey(serviceUrl)
 	s, _ := metaClient.Services(namespace).Get(name)
 	if s != nil {
-		log.LOGGER.Infof("Service %s is found in this cluster. namespace : %s, name: %s", serviceUrl, namespace, name)
+		klog.Infof("Service %s is found in this cluster. namespace : %s, name: %s", serviceUrl, namespace, name)
 		return true, nil
 	}
-	log.LOGGER.Infof("Service %s is not found in this cluster", serviceUrl)
+	klog.Infof("Service %s is not found in this cluster", serviceUrl)
 	return false, nil
 }
 
diff --git a/edgemesh/pkg/server/ip.go b/edgemesh/pkg/server/ip.go
index 457af1667..9d2716af3 100644
--- a/edgemesh/pkg/server/ip.go
+++ b/edgemesh/pkg/server/ip.go
@@ -4,9 +4,11 @@ import (
 	"net"
 	"time"
 
-	"github.com/kubeedge/beehive/pkg/common/log"
+	"k8s.io/klog"
 )
+
 const inter = "docker0"
+
 // getIP returns the specific interface ip of version 4
 func getIP() (net.IP, error) {
 	for {
@@ -20,7 +22,7 @@ func getIP() (net.IP, error) {
 				return ip, nil
 			}
 		}
-		log.LOGGER.Warnf("the interface %s have not config ip of version 4",inter)
+		klog.Warningf("the interface %s have not config ip of version 4", inter)
 		time.Sleep(time.Second * 3)
 	}
 }
diff --git a/edgemesh/pkg/server/server.go b/edgemesh/pkg/server/server.go
index 6994be339..206b32007 100644
--- a/edgemesh/pkg/server/server.go
+++ b/edgemesh/pkg/server/server.go
@@ -6,9 +6,10 @@ import (
 	"github.com/go-chassis/go-chassis/core/config/model"
 	"github.com/go-chassis/go-chassis/core/loadbalancer"
 	"github.com/go-chassis/go-chassis/core/registry"
+
+	mconfig "github.com/kubeedge/beehive/pkg/common/config"
 	_ "github.com/kubeedge/kubeedge/edgemesh/pkg/panel"
 	edgeregistry "github.com/kubeedge/kubeedge/edgemesh/pkg/registry"
-	mconfig "github.com/kubeedge/beehive/pkg/common/config"
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/resolver"
 )
 
@@ -38,12 +39,13 @@ func Start() {
 	registry.DefaultServiceDiscoveryService = edgeregistry.NewServiceDiscovery(opt)
 	myStrategy := mconfig.CONFIG.GetConfigurationByKey("mesh.loadbalance.strategy-name").(string)
 	loadbalancer.InstallStrategy(myStrategy, func() loadbalancer.Strategy {
-		switch myStrategy{
+		switch myStrategy {
 		case "RoundRobin":
 			return &loadbalancer.RoundRobinStrategy{}
 		case "Random":
 			return &loadbalancer.RandomStrategy{}
-		default: return &loadbalancer.RoundRobinStrategy{}
+		default:
+			return &loadbalancer.RoundRobinStrategy{}
 		}
 	})
 	//Start dns server
diff --git a/edgemesh/pkg/server/tcp.go b/edgemesh/pkg/server/tcp.go
index a190858e6..08b5b0225 100644
--- a/edgemesh/pkg/server/tcp.go
+++ b/edgemesh/pkg/server/tcp.go
@@ -9,31 +9,32 @@ import (
 	"github.com/go-chassis/go-chassis/core/common"
 	"github.com/go-chassis/go-chassis/core/handler"
 	"github.com/go-chassis/go-chassis/core/invocation"
+	"k8s.io/klog"
+
 	"github.com/kubeedge/beehive/pkg/common/config"
-	"github.com/kubeedge/beehive/pkg/common/log"
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/resolver"
 )
 
 func StartTCP() {
-	server, err:= getIP()
+	server, err := getIP()
 	if err != nil {
-		log.LOGGER.Errorf("TCP server start error : %s", err)
+		klog.Errorf("TCP server start error : %s", err)
 		return
 	}
 
 	serverIP := server.String()
 	port := config.GetString("port", "8080")
-	log.LOGGER.Infof("start listening at %s:%s", serverIP, port)
+	klog.Infof("start listening at %s:%s", serverIP, port)
 	listener, err := net.Listen("tcp", serverIP+":"+port)
 	if err != nil {
-		log.LOGGER.Errorf("failed to start TCP server with error:%v\n", err)
+		klog.Errorf("failed to start TCP server with error:%v\n", err)
 		return
 	}
 
 	for {
 		conn, err := listener.Accept()
 		if err != nil {
-			log.LOGGER.Errorf("failed to accept, err: %v\n", err)
+			klog.Errorf("failed to accept, err: %v\n", err)
 			continue
 		}
 
@@ -57,14 +58,14 @@ func httpResponseToStr(resp *http.Response) string {
 }
 
 func process(conn net.Conn) {
-	log.LOGGER.Info("start receiving data...\n")
+	klog.Info("start receiving data...\n")
 
 	buffer := make([]byte, 1024)
 	d := make(chan []byte, 1024)
 	s := make(chan interface{}, 1)
 	restResponse := func(data *invocation.Response) error {
 		if data.Err != nil {
-			log.LOGGER.Errorf("error in response:%v", data.Err)
+			klog.Errorf("error in response:%v", data.Err)
 			conn.Write([]byte(data.Err.Error()))
 			return data.Err
 		} else {
@@ -77,7 +78,7 @@ func process(conn net.Conn) {
 	fakeResponse := func(data *invocation.Response) error {
 		defer conn.Close()
 		if data.Err != nil {
-			log.LOGGER.Errorf("error in response:%v", data.Err)
+			klog.Errorf("error in response:%v", data.Err)
 			conn.Write([]byte(data.Err.Error()))
 			return data.Err
 		} else {
@@ -91,13 +92,13 @@ func process(conn net.Conn) {
 		if invocation.Protocol == "rest" {
 			c, err := handler.CreateChain(common.Consumer, protocol, handler.Loadbalance, handler.Transport)
 			if err != nil {
-				log.LOGGER.Errorf("failed to create handlerchain:%v", err)
+				klog.Errorf("failed to create handlerchain:%v", err)
 			}
 			c.Next(&invocation, restResponse)
 		} else {
 			c, err := handler.CreateChain(common.Consumer, protocol)
 			if err != nil {
-				log.LOGGER.Errorf("failed to create handlerchain:%v", err)
+				klog.Errorf("failed to create handlerchain:%v", err)
 			}
 			c.Next(&invocation, fakeResponse)
 		}
@@ -108,7 +109,7 @@ func process(conn net.Conn) {
 	for {
 		num, err := conn.Read(buffer)
 		if err == nil {
-			log.LOGGER.Infof("buffer:\n%s\n", buffer)
+			klog.Infof("buffer:\n%s\n", buffer)
 			d <- buffer[:num]
 		}
 		if err == io.EOF {
diff --git a/edgemesh/pkg/server/tcp_test.go b/edgemesh/pkg/server/tcp_test.go
index d67a22ce1..a09e630ef 100644
--- a/edgemesh/pkg/server/tcp_test.go
+++ b/edgemesh/pkg/server/tcp_test.go
@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"github.com/kubeedge/beehive/pkg/common/log"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -15,6 +14,8 @@ import (
 
 	"github.com/go-chassis/go-chassis/core/handler"
 	"github.com/go-chassis/go-chassis/core/invocation"
+	"k8s.io/klog"
+
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/resolver"
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/server"
 )
@@ -42,7 +43,7 @@ func testTransferHTTPRequest(req *http.Request) (invocation.Invocation, error) {
 	clt := &http.Client{}
 	u, err := url.Parse("http://127.0.0.1:9090")
 	if err != nil {
-		log.LOGGER.Errorf("Parse new url error: %v\n", err)
+		klog.Errorf("Parse new url error: %v\n", err)
 		return invocation.Invocation{}, err
 	}
 	req.URL = u
@@ -54,11 +55,11 @@ func testTransferHTTPRequest(req *http.Request) (invocation.Invocation, error) {
 		defer resp.Body.Close()
 	}
 	if err != nil {
-		log.LOGGER.Errorf("Resolve http request failed with error: %v\n", err)
+		klog.Errorf("Resolve http request failed with error: %v\n", err)
 		return invocation.Invocation{}, err
 	}
 	respBodyBytes, _ := ioutil.ReadAll(resp.Body)
-	log.LOGGER.Infof("resolve http resp body: %s\n", respBodyBytes)
+	klog.Infof("resolve http resp body: %s\n", respBodyBytes)
 	return invocation.Invocation{MicroServiceName: "http", Protocol: "rest", Args: resp}, nil
 }
 
@@ -91,7 +92,7 @@ func (resolver *TestResolver) Resolve(data chan []byte, stop chan interface{}, i
 			invCallback(protocol, i)
 			return i, true
 		}
-		log.LOGGER.Infof("content: %s\n", content)
+		klog.Infof("content: %s\n", content)
 	}
 }
 
@@ -143,7 +144,7 @@ func StartHTTPServer() {
 			http.HandleFunc("/", helloHTTP)
 			err := http.ListenAndServe(":9090", nil)
 			if err != nil {
-				log.LOGGER.Errorf("ListenAndServe error: %v\n", err)
+				klog.Errorf("ListenAndServe error: %v\n", err)
 			}
 		}()
 		httpServerStarted = true
@@ -155,10 +156,10 @@ func handleTCPRead(conn net.Conn, done chan string) {
 	buf := make([]byte, 1024)
 	_, err := conn.Read(buf)
 	if err != nil {
-		log.LOGGER.Infof("Error to read from TCP server: ", err)
+		klog.Infof("Error to read from TCP server: ", err)
 		return
 	}
-	log.LOGGER.Info("TCP server response: " + string(buf[:]))
+	klog.Info("TCP server response: " + string(buf[:]))
 
 	done <- "done"
 }
@@ -223,7 +224,7 @@ func TestResolveHTTP(t *testing.T) {
 		t.Errorf("do http GET request failed with error: %v\n", err)
 		return
 	}
-	log.LOGGER.Infof("GET response: %v\n", resp1)
+	klog.Infof("GET response: %v\n", resp1)
 
 	//do POST request
 	data := url.Values{"Name": {"Mark"}, "Age": {"20"}}
@@ -242,7 +243,7 @@ func TestResolveHTTP(t *testing.T) {
 		t.Errorf("do http POST request failed with error: %v\n", err)
 		return
 	}
-	log.LOGGER.Infof("POST response: %v\n", resp2)
+	klog.Infof("POST response: %v\n", resp2)
 
 	time.Sleep(3 * time.Second)
 }