update log

Signed-off-by: lance6716 <lance6716@gmail.com>
pingcap · Aug 24, 2023 · 8f4ca49 · 8f4ca49
1 parent 7e29a1b
commit 8f4ca49
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/br/pkg/lightning/backend/local/mockserver/main/main.go b/br/pkg/lightning/backend/local/mockserver/main/main.go
@@ -26,7 +26,8 @@ import (
 )
 
 func main() {
-	lis, err := net.Listen("tcp", ":0")
+	portStr := os.Args[1]
+	lis, err := net.Listen("tcp", ":"+portStr)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/br/pkg/lightning/backend/local/mockserver/main2/main.go b/br/pkg/lightning/backend/local/mockserver/main2/main.go
@@ -17,10 +17,11 @@ package main
 import (
 	"context"
 	"fmt"
-	"log"
 	"os"
 
 	sst "github.com/pingcap/kvproto/pkg/import_sstpb"
+	"github.com/pingcap/log"
+	"go.uber.org/zap"
 	"google.golang.org/grpc"
 )
 
@@ -29,13 +30,14 @@ func main() {
 
 	conn, err := grpc.DialContext(ctx, os.Args[1], grpc.WithInsecure())
 	if err != nil {
-		log.Fatal(err)
+		log.Fatal("fail to dial", zap.Error(err))
 	}
 	for {
 		client := sst.NewImportSSTClient(conn)
 		stream, err := client.Write(ctx)
 		if err != nil {
-			log.Fatal(err)
+			log.Error("fail to write", zap.Error(err))
+			continue
 		}
 		err = stream.Send(&sst.WriteRequest{
 			Chunk: &sst.WriteRequest_Meta{
@@ -45,11 +47,13 @@ func main() {
 			},
 		})
 		if err != nil {
-			log.Fatal(err)
+			log.Error("fail to send", zap.Error(err))
+			continue
 		}
 		resp, err := stream.CloseAndRecv()
 		if err != nil {
-			log.Fatal(err)
+			log.Error("fail to close and recv", zap.Error(err))
+			continue
 		}
 		fmt.Printf("resp: %v\n", resp)
 	}