diff --git a/tools/keeper/api/report.go b/tools/keeper/api/report.go
index 876d99da2d..86658c3ea6 100644
--- a/tools/keeper/api/report.go
+++ b/tools/keeper/api/report.go
@@ -332,7 +332,7 @@ func (r *Reporter) handlerFunc() gin.HandlerFunc {
 
 		logger.Tracef("report data:%s", string(data))
 		if e := json.Unmarshal(data, &report); e != nil {
-			logger.Errorf("error occurred while unmarshal request, data:%s, error:%s", data, err)
+			logger.Errorf("error occurred while unmarshal request, data:%s, error:%v", data, e)
 			return
 		}
 		var sqls []string
diff --git a/tools/keeper/cmd/command.go b/tools/keeper/cmd/command.go
index 33d2482628..25230bdaef 100644
--- a/tools/keeper/cmd/command.go
+++ b/tools/keeper/cmd/command.go
@@ -58,7 +58,7 @@ func NewCommand(conf *config.Config) *Command {
 		panic(err)
 	}
 
-	imp := &Command{
+	return &Command{
 		client:   client,
 		conn:     conn,
 		username: conf.TDengine.Username,
@@ -70,7 +70,6 @@ func NewCommand(conf *config.Config) *Command {
 			RawQuery: fmt.Sprintf("db=%s&precision=ms", conf.Metrics.Database.Name),
 		},
 	}
-	return imp
 }
 
 func (cmd *Command) Process(conf *config.Config) {
@@ -101,7 +100,7 @@ func (cmd *Command) Process(conf *config.Config) {
 }
 
 func (cmd *Command) ProcessTransfer(conf *config.Config) {
-	fromTime, err := time.Parse("2006-01-02T15:04:05Z07:00", conf.FromTime)
+	fromTime, err := time.Parse(time.RFC3339, conf.FromTime)
 	if err != nil {
 		logger.Errorf("parse fromTime error, msg:%s", err)
 		return
@@ -401,7 +400,6 @@ func (cmd *Command) TransferTaosdClusterBasicInfo() error {
 
 // cluster_info
 func (cmd *Command) TransferTableToDst(sql string, dstTable string, tagNum int) error {
-
 	ctx := context.Background()
 
 	endTime := time.Now()
diff --git a/tools/keeper/monitor/system.go b/tools/keeper/monitor/system.go
index 7d5ef5bd54..e088be5fc1 100644
--- a/tools/keeper/monitor/system.go
+++ b/tools/keeper/monitor/system.go
@@ -41,33 +41,31 @@ func (s *sysMonitor) collect() {
 	}
 
 	s.Lock()
+	defer s.Unlock()
+
 	for output := range s.outputs {
 		select {
 		case output <- *s.status:
 		default:
 		}
 	}
-	s.Unlock()
 }
 
 func (s *sysMonitor) Register(c chan<- SysStatus) {
 	s.Lock()
+	defer s.Unlock()
 	if s.outputs == nil {
-		s.outputs = map[chan<- SysStatus]struct{}{
-			c: {},
-		}
-	} else {
-		s.outputs[c] = struct{}{}
+		s.outputs = map[chan<- SysStatus]struct{}{}
 	}
-	s.Unlock()
+	s.outputs[c] = struct{}{}
 }
 
 func (s *sysMonitor) Deregister(c chan<- SysStatus) {
 	s.Lock()
+	defer s.Unlock()
 	if s.outputs != nil {
 		delete(s.outputs, c)
 	}
-	s.Unlock()
 }
 
 var SysMonitor = &sysMonitor{status: &SysStatus{}}