add log

server/workerManager.go

@@ -414,9 +414,9 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
 	return nil
 }
 func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
-	l := log.WithField("worker-addr", worker.addr)
-	l.WithField("worker", worker.uuid).Info("start handle worker message")
-	defer l.WithField("worker", worker.uuid).Info("exit handle worker message")
+	l := log.WithField("worker-uuid", worker.uuid)
+	l.WithField("worker-addr", worker.addr).Info("start handle worker message")
+	defer l.WithField("worker-addr", worker.addr).Info("exit handle worker message")
 	for {
 		select {
 		case <-wm.quit:
@@ -426,7 +426,7 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
 		default:
 			wmsg, err := worker.stream.Recv()
 			if err != nil {
-				l.WithError(err).WithField("worker", worker.uuid).Error("recv msg failed")
+				l.WithError(err).WithField("worker-addr", worker.addr).Error("recv msg failed")
 				close(worker.quit)
 				return
 			}
@@ -442,24 +442,24 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
 				worker.online = true
 				wm.UpdateHeartBeat(worker.uuid)
 				l.WithFields(log.Fields{
-					"worker":   worker.uuid,
-					"hearBeat": time.Now().Unix() - int64(msg.HeartbeatResponse.Timestamp),
+					"worker-addr": worker.addr,
+					"hearBeat":    time.Now().Unix() - int64(msg.HeartbeatResponse.Timestamp),
 				}).Debug("receive worker heartbeat")
 			case *omanager.WorkerMessage_Status:
 				// todo: store worker status
 				worker.status = msg.Status.DeviceStatus
 				l.WithFields(log.Fields{
-					"worker": worker.uuid,
+					"worker-addr": worker.addr,
 				}).Debugf("receive worker status:0x%x", msg.Status.DeviceStatus)
 			case *omanager.WorkerMessage_ResourceMap:
 				// todo: store worker resource map.
 				l.WithFields(log.Fields{
-					"worker": worker.uuid,
+					"worker-addr": worker.addr,
 				}).Debugf("receive worker resource map:%v", msg.ResourceMap)
 			case *omanager.WorkerMessage_DeviceInfo:
 				// todo: handler worker device info
 				l.WithFields(log.Fields{
-					"worker": worker.uuid,
+					"worker-addr": worker.addr,
 				}).Debugf("receive worker device info:%v", msg.DeviceInfo)
 				{
 					// receive device info
@@ -469,8 +469,8 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
 					var addr = ""
 					if pubkey, err := utils.HexToPubkey(worker.publicKey); err != nil {
 						l.WithFields(log.Fields{
-							"worker": worker.uuid,
-							"error":  err,
+							"worker-addr": worker.addr,
+							"error":       err,
 						}).Error("parse pubkey failed")
 					} else {
 						addr = utils.PubkeyToAddress(pubkey)
@@ -484,8 +484,8 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
 						infoData, err := json.Marshal(msg.DeviceInfo.Devices)
 						if err != nil {
 							l.WithFields(log.Fields{
-								"worker": worker.uuid,
-								"error":  err,
+								"worker-addr": worker.addr,
+								"error":       err,
 							}).Error("marshal device info failed")
 						} else if len(infoData) > 0 {
 							infoHash := sha3.Sum256(infoData)
@@ -504,11 +504,11 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
 				// todo: handler worker device usage
 				worker.usageInfo = msg.DeviceUsage.Usage
 				l.WithFields(log.Fields{
-					"worker": worker.uuid,
+					"worker-addr": worker.addr,
 				}).Debugf("receive worker device usage:%v", msg.DeviceUsage.Usage)
 
 			default:
-				l.WithField("worker", worker.uuid).Error(fmt.Sprintf("unsupport msg type %T", msg))
+				l.WithField("worker-addr", worker.addr).Error(fmt.Sprintf("unsupport msg type %T", msg))
 			}
 		}
 	}