add log

server/workerManager.go

@@ -406,8 +406,9 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
 	return nil
 }
 func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
-	log.WithField("worker", worker.uuid).Info("start handle worker message")
-	defer log.WithField("worker", worker.uuid).Info("exit handle worker message")
+	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")
 	for {
 		select {
 		case <-wm.quit:
@@ -417,7 +418,7 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
 		default:
 			wmsg, err := worker.stream.Recv()
 			if err != nil {
-				log.WithError(err).WithField("worker", worker.uuid).Error("recv msg failed")
+				l.WithError(err).WithField("worker", worker.uuid).Error("recv msg failed")
 				close(worker.quit)
 				return
 			}
@@ -430,24 +431,24 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
 				worker.resultCh <- msg.SubmitTaskResult
 			case *omanager.WorkerMessage_HeartbeatResponse:
 				wm.UpdateHeartBeat(worker.uuid)
-				log.WithFields(log.Fields{
+				l.WithFields(log.Fields{
 					"worker":   worker.uuid,
 					"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
-				log.WithFields(log.Fields{
+				l.WithFields(log.Fields{
 					"worker": worker.uuid,
 				}).Debugf("receive worker status:0x%x", msg.Status.DeviceStatus)
 			case *omanager.WorkerMessage_ResourceMap:
 				// todo: store worker resource map.
-				log.WithFields(log.Fields{
+				l.WithFields(log.Fields{
 					"worker": worker.uuid,
 				}).Debugf("receive worker resource map:%v", msg.ResourceMap)
 			case *omanager.WorkerMessage_DeviceInfo:
 				// todo: handler worker device info
-				log.WithFields(log.Fields{
+				l.WithFields(log.Fields{
 					"worker": worker.uuid,
 				}).Debugf("receive worker device info:%v", msg.DeviceInfo)
 				{
@@ -457,7 +458,7 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
 					worker.benefitAddr = msg.DeviceInfo.BenefitAddress
 					var addr = ""
 					if pubkey, err := utils.HexToPubkey(worker.publicKey); err != nil {
-						log.WithFields(log.Fields{
+						l.WithFields(log.Fields{
 							"worker": worker.uuid,
 							"error":  err,
 						}).Error("parse pubkey failed")
@@ -472,7 +473,7 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
 					if worker.addr != "" {
 						infoData, err := json.Marshal(msg.DeviceInfo.Devices)
 						if err != nil {
-							log.WithFields(log.Fields{
+							l.WithFields(log.Fields{
 								"worker": worker.uuid,
 								"error":  err,
 							}).Error("marshal device info failed")
@@ -492,12 +493,12 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
 			case *omanager.WorkerMessage_DeviceUsage:
 				// todo: handler worker device usage
 				worker.usageInfo = msg.DeviceUsage.Usage
-				log.WithFields(log.Fields{
+				l.WithFields(log.Fields{
 					"worker": worker.uuid,
 				}).Debugf("receive worker device usage:%v", msg.DeviceUsage.Usage)
 
 			default:
-				log.WithField("worker", worker.uuid).Error(fmt.Sprintf("unsupport msg type %T", msg))
+				l.WithField("worker", worker.uuid).Error(fmt.Sprintf("unsupport msg type %T", msg))
 			}
 		}
 	}