style: 优化的日志信息

Author: rehiy

module/worker/recv_exec.go

@@ -17,15 +17,16 @@ func (pod *RecvPod) Exec(rs *SocketData) error {
 		data *command.ExecPayload
 	)
 
+	log.Println("Exec:recv", rs.Payload)
+
 	if mapstructure.Decode(rs.Payload, &data) == nil {
-		log.Println("Exec:wait", data.Name)
 		ret, err = command.Exec(data)
 	} else {
 		err = errors.New("无法解析请求参数")
 	}
 
 	if err != nil {
-		log.Println("Exec:error", err)
+		log.Println("Exec:fail", err)
 	} else {
 		log.Println("Exec:done", data.Name)
 	}
@@ -40,11 +41,5 @@ func (pod *RecvPod) Exec(rs *SocketData) error {
 		},
 	}
 
-	if err := pod.Write(rq); err != nil {
-		log.Println("Exec:resp", err)
-		return err
-	}
-
-	return err
-
+	return pod.Write(rq)
 }

module/worker/recv_stat.go

@@ -8,17 +8,14 @@ import (
 
 func (pod *RecvPod) Stat(rs *SocketData) error {
 
+	log.Println("Stat:recv Id", rs.TaskId)
+
 	rq := &SocketData{
 		Method:  "Stat:resp",
 		TaskId:  rs.TaskId,
 		Payload: psutil.Detail(),
 	}
 
-	if err := pod.Write(rq); err != nil {
-		log.Println("Exec:resp", err)
-		return err
-	}
-
-	return nil
+	return pod.Write(rq)
 
 }

module/worker/send_ping.go

@@ -9,14 +9,14 @@ import (
 
 func (pod *SendPod) Ping() (uint, error) {
 
+	log.Println("Ping:send", "SummaryStat")
+
 	rq := &SocketData{
 		Method:  "Ping",
 		TaskId:  0,
 		Payload: psutil.Summary(),
 	}
 
-	log.Println("Ping:send", "SummaryStat")
-
 	return rq.TaskId, pod.Write(rq)
 
 }
@@ -33,7 +33,7 @@ func PingLoop(pod *SendPod) error {
 
 	for {
 		if _, err := pod.Ping(); err != nil {
-			log.Println("Ping:error", err)
+			log.Println("Ping:fail", err)
 			return err
 		}
 		time.Sleep(25 * time.Second)

module/workhub/poolman.go

@@ -63,9 +63,9 @@ func WorkerOfUser(userId uint) []*Worker {
 
 }
 
-func NewSender(workerId string) *SendPod {
+func NewSender(id string) *SendPod {
 
-	if worker, ok := workerPool[workerId]; ok {
+	if worker, ok := workerPool[id]; ok {
 		return &SendPod{worker}
 	}
 

module/workhub/recv_ping.go

@@ -1,11 +1,15 @@
 package workhub
 
 import (
+	"log"
+
 	"github.com/mitchellh/mapstructure"
 )
 
 func (pod *RecvPod) Ping(rq *SocketData) error {
 
+	log.Println("Ping:recv By", pod.WorkerMeta.HostName)
+
 	mapstructure.Decode(rq.Payload, &pod.WorkerMeta)
 
 	rs := &SocketData{

module/workhub/send_exec.go

@@ -1,11 +1,14 @@
 package workhub
 
 import (
+	"log"
 	"tdp-cloud/helper/command"
 )
 
 func (pod *SendPod) Exec(data *command.ExecPayload) (uint, error) {
 
+	log.Println("Exec:send To", pod.WorkerMeta.HostName)
+
 	taskId := createHistory(pod, data)
 
 	rq := &SocketData{
@@ -20,6 +23,8 @@ func (pod *SendPod) Exec(data *command.ExecPayload) (uint, error) {
 
 func (pod *RespPod) Exec(rq *SocketData) {
 
+	log.Println("Exec:resp By", pod.WorkerMeta.HostName)
+
 	updateHistory(pod, rq)
 
 }

module/workhub/send_stat.go

@@ -1,11 +1,14 @@
 package workhub
 
 import (
+	"log"
 	"time"
 )
 
 func (pod *SendPod) Stat() (uint, error) {
 
+	log.Println("Stat:send To", pod.WorkerMeta.HostName)
+
 	rq := &SocketData{
 		Method: "Stat",
 		TaskId: uint(time.Now().Unix()),
@@ -17,6 +20,8 @@ func (pod *SendPod) Stat() (uint, error) {
 
 func (pod *RespPod) Stat(rq *SocketData) {
 
+	log.Println("Stat:resp By", pod.WorkerMeta.HostName)
+
 	workerResp[rq.TaskId] = rq.Payload
 
 }