From f8036715c5e2901be2e4fdf2c0fc21f7fddef835 Mon Sep 17 00:00:00 2001 From: "zuozheng.hzz" Date: Thu, 19 Aug 2021 16:02:34 +0800 Subject: [PATCH 1/3] fix: adjust dfget download log Signed-off-by: zuozheng.hzz --- client/dfget/dfget.go | 8 ++++---- cmd/dfget/cmd/root.go | 13 +++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/client/dfget/dfget.go b/client/dfget/dfget.go index 01fd112ae4d..1f9ce621f55 100644 --- a/client/dfget/dfget.go +++ b/client/dfget/dfget.go @@ -107,8 +107,8 @@ func download(ctx context.Context, client daemonclient.DaemonClient, cfg *config _ = pb.Close() } - wLog.Infof("download from daemon success, length: %dByte cost: %dms", result.CompletedLength, time.Now().Sub(start).Milliseconds()) - fmt.Printf("finish total length %d Byte\n", result.CompletedLength) + wLog.Infof("download from daemon success, length: %d cost: %d", result.CompletedLength, time.Now().Sub(start).Milliseconds()) + fmt.Printf("finish total length %dbytes\n", result.CompletedLength) break } @@ -174,8 +174,8 @@ func downloadFromSource(ctx context.Context, cfg *config.DfgetConfig, hdr map[st return err } - wLog.Infof("download from source success, length: %dByte cost: %dms", written, time.Now().Sub(start).Milliseconds()) - fmt.Printf("finish total length %d Byte\n", written) + wLog.Infof("download from source success, length: %d cost: %d", written, time.Now().Sub(start).Milliseconds()) + fmt.Printf("finish total length %dbytes\n", written) return nil } diff --git a/cmd/dfget/cmd/root.go b/cmd/dfget/cmd/root.go index 3e96304b91e..44d4a4c55f6 100644 --- a/cmd/dfget/cmd/root.go +++ b/cmd/dfget/cmd/root.go @@ -82,17 +82,22 @@ var rootCmd = &cobra.Command{ } fmt.Printf("--%s-- %s\n", start.Format("2006-01-02 15:04:05"), dfgetConfig.URL) - fmt.Printf("current user[%s] output path[%s]\n", basic.Username, dfgetConfig.Output) - fmt.Printf("dfget version[%s] default peer ip[%s]\n", version.GitVersion, iputils.HostIP) + fmt.Printf("dfget version: %s\n", version.GitVersion) + fmt.Printf("current user: %s, default peer ip: %s\n", basic.Username, iputils.HostIP) + fmt.Printf("output path: %s\n", dfgetConfig.Output) // do get file + var errInfo string err := runDfget() + if err != nil { + errInfo = fmt.Sprintf("error: %v", err) + } - msg := fmt.Sprintf("download success: %t cost: %dms error:[%v]", err == nil, time.Now().Sub(start).Milliseconds(), err) + msg := fmt.Sprintf("download success: %t cost: %dms %s", err == nil, time.Now().Sub(start).Milliseconds(), errInfo) logger.With("url", dfgetConfig.URL).Info(msg) fmt.Println(msg) - return errors.Wrapf(err, "download url[%s]", dfgetConfig.URL) + return errors.Wrapf(err, "download url: %s", dfgetConfig.URL) }, } From c2288bf83aebd21010bd4f74b396a663961e7901 Mon Sep 17 00:00:00 2001 From: "zuozheng.hzz" Date: Thu, 19 Aug 2021 16:25:34 +0800 Subject: [PATCH 2/3] fix: adjust dfget console log Signed-off-by: zuozheng.hzz --- client/dfget/dfget.go | 8 ++++---- cmd/dfget/cmd/root.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/dfget/dfget.go b/client/dfget/dfget.go index 1f9ce621f55..8c9df1c220a 100644 --- a/client/dfget/dfget.go +++ b/client/dfget/dfget.go @@ -107,8 +107,8 @@ func download(ctx context.Context, client daemonclient.DaemonClient, cfg *config _ = pb.Close() } - wLog.Infof("download from daemon success, length: %d cost: %d", result.CompletedLength, time.Now().Sub(start).Milliseconds()) - fmt.Printf("finish total length %dbytes\n", result.CompletedLength) + wLog.Infof("download from daemon success, length: %d bytes cost: %d ms", result.CompletedLength, time.Now().Sub(start).Milliseconds()) + fmt.Printf("finish total length %d bytes\n", result.CompletedLength) break } @@ -174,8 +174,8 @@ func downloadFromSource(ctx context.Context, cfg *config.DfgetConfig, hdr map[st return err } - wLog.Infof("download from source success, length: %d cost: %d", written, time.Now().Sub(start).Milliseconds()) - fmt.Printf("finish total length %dbytes\n", written) + wLog.Infof("download from source success, length: %d bytes cost: %d ms", written, time.Now().Sub(start).Milliseconds()) + fmt.Printf("finish total length %d bytes\n", written) return nil } diff --git a/cmd/dfget/cmd/root.go b/cmd/dfget/cmd/root.go index 44d4a4c55f6..aad9ee09cfc 100644 --- a/cmd/dfget/cmd/root.go +++ b/cmd/dfget/cmd/root.go @@ -90,10 +90,10 @@ var rootCmd = &cobra.Command{ var errInfo string err := runDfget() if err != nil { - errInfo = fmt.Sprintf("error: %v", err) + errInfo = fmt.Sprintf(", error: %v", err) } - msg := fmt.Sprintf("download success: %t cost: %dms %s", err == nil, time.Now().Sub(start).Milliseconds(), errInfo) + msg := fmt.Sprintf("download success: %t cost: %d ms%s", err == nil, time.Now().Sub(start).Milliseconds(), errInfo) logger.With("url", dfgetConfig.URL).Info(msg) fmt.Println(msg) From d564b8adfd79916921ffcdf9f7e9d45cd4b391de Mon Sep 17 00:00:00 2001 From: "zuozheng.hzz" Date: Thu, 19 Aug 2021 16:29:19 +0800 Subject: [PATCH 3/3] fix: adjust dfget console log Signed-off-by: zuozheng.hzz --- cmd/dfget/cmd/root.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/dfget/cmd/root.go b/cmd/dfget/cmd/root.go index aad9ee09cfc..cfaee67c959 100644 --- a/cmd/dfget/cmd/root.go +++ b/cmd/dfget/cmd/root.go @@ -90,10 +90,10 @@ var rootCmd = &cobra.Command{ var errInfo string err := runDfget() if err != nil { - errInfo = fmt.Sprintf(", error: %v", err) + errInfo = fmt.Sprintf("error: %v", err) } - msg := fmt.Sprintf("download success: %t cost: %d ms%s", err == nil, time.Now().Sub(start).Milliseconds(), errInfo) + msg := fmt.Sprintf("download success: %t cost: %d ms %s", err == nil, time.Now().Sub(start).Milliseconds(), errInfo) logger.With("url", dfgetConfig.URL).Info(msg) fmt.Println(msg)