From f62cd7bf386dc3058a01ed75c69d642fbe504b7f Mon Sep 17 00:00:00 2001 From: Jim Ma Date: Thu, 10 Jun 2021 15:27:44 +0800 Subject: [PATCH] optimize log and fix typo (#311) Signed-off-by: Jim Ma --- client/daemon/peer/peertask_base.go | 4 +++- cmd/scheduler/cmd/root.go | 1 + pkg/rpc/scheduler/client/client.go | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/daemon/peer/peertask_base.go b/client/daemon/peer/peertask_base.go index c5f444c61..7d135903a 100644 --- a/client/daemon/peer/peertask_base.go +++ b/client/daemon/peer/peertask_base.go @@ -210,9 +210,11 @@ loop: if de, ok := err.(*dferrors.DfError); ok { pt.failedCode = de.Code pt.failedReason = de.Message + pt.Errorf("receive peer packet failed: %s", pt.failedReason) + } else { + pt.Errorf("receive peer packet failed: %s", err) } pt.cancel() - pt.Errorf(pt.failedReason) if !firstSpanDone { firstPeerSpan.RecordError(err) } diff --git a/cmd/scheduler/cmd/root.go b/cmd/scheduler/cmd/root.go index ad78022b1..871bbe8e4 100644 --- a/cmd/scheduler/cmd/root.go +++ b/cmd/scheduler/cmd/root.go @@ -83,6 +83,7 @@ func runScheduler() error { svr, err := server.New(cfg) if err != nil { + logger.Errorf("get scheduler server error: %s", err) return err } diff --git a/pkg/rpc/scheduler/client/client.go b/pkg/rpc/scheduler/client/client.go index 7cc8b921d..6aa1d6b43 100644 --- a/pkg/rpc/scheduler/client/client.go +++ b/pkg/rpc/scheduler/client/client.go @@ -40,7 +40,7 @@ import ( func GetClientByAddr(addrs []dfnet.NetAddr, opts ...grpc.DialOption) (SchedulerClient, error) { if len(addrs) == 0 { - return nil, errors.New("address list of cdn is empty") + return nil, errors.New("address list of scheduler is empty") } sc := &schedulerClient{ rpc.NewConnection(context.Background(), "scheduler-static", addrs, []rpc.ConnOption{