fix: fix log

bnb-chain · Dec 5, 2023 · 6e85f51 · 6e85f51
1 parent aed04d7
commit 6e85f51
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/base/gfspapp/app_options.go b/base/gfspapp/app_options.go
@@ -158,7 +158,7 @@ const (
 	SignerFailureDeposit = "signer_Deposit_failure"
 
 	SignerSuccessDeleteGlobalVirtualGroup = "signer_delete_global_virtual_group_success"
-	SignerFailureDeleteGlobalVirtualGroup = "signer_DeleteGlobalVirtualGroup_failure"
+	SignerFailureDeleteGlobalVirtualGroup = "signer_delete_global_virtual_group_failure"
 
 	UploaderSuccessPutObject = "uploader_put_object_success"
 	UploaderFailurePutObject = "uploader_put_object_failure"

diff --git a/base/gfspapp/sign_server.go b/base/gfspapp/sign_server.go
@@ -294,7 +294,7 @@ func (g *GfSpBaseApp) GfSpSign(ctx context.Context, req *gfspserver.GfSpSignRequ
 	case *gfspserver.GfSpSignRequest_Deposit:
 		txHash, err = g.signer.Deposit(ctx, t.Deposit)
 		if err != nil {
-			log.CtxErrorw(ctx, "failed to sign deposit", "error", err)
+			log.CtxErrorw(ctx, "failed to deposit", "error", err)
 			metrics.ReqCounter.WithLabelValues(SignerFailureDeposit).Inc()
 			metrics.ReqTime.WithLabelValues(SignerFailureDeposit).Observe(time.Since(startTime).Seconds())
 		} else {
@@ -304,7 +304,7 @@ func (g *GfSpBaseApp) GfSpSign(ctx context.Context, req *gfspserver.GfSpSignRequ
 	case *gfspserver.GfSpSignRequest_DeleteGlobalVirtualGroup:
 		txHash, err = g.signer.DeleteGlobalVirtualGroup(ctx, t.DeleteGlobalVirtualGroup)
 		if err != nil {
-			log.CtxErrorw(ctx, "failed to sign delete global virtual group", "error", err)
+			log.CtxErrorw(ctx, "failed to delete global virtual group", "error", err)
 			metrics.ReqCounter.WithLabelValues(SignerFailureDeleteGlobalVirtualGroup).Inc()
 			metrics.ReqTime.WithLabelValues(SignerFailureDeleteGlobalVirtualGroup).Observe(time.Since(startTime).Seconds())
 		} else {

diff --git a/base/gfspvgmgr/virtual_group_manager.go b/base/gfspvgmgr/virtual_group_manager.go
@@ -556,7 +556,7 @@ func (vgm *virtualGroupManager) monitorGVGUsage(gvg *virtualgrouptypes.GlobalVir
 
 	curTime := time.Now().Unix()
 	if isEmpty(gvg) {
-		// Remove any GVG from the gvgGCMap if the stored size is no longer empty.
+		// Remove any GVG from the gvgGCMap if it is no longer empty.
 		vgm.gvgGCMap.Range(func(k, v interface{}) bool {
 			safeDeleteTime := v.(int64)
 			if curTime > safeDeleteTime+int64(time.Minute.Seconds()) {
@@ -566,12 +566,14 @@ func (vgm *virtualGroupManager) monitorGVGUsage(gvg *virtualgrouptypes.GlobalVir
 		})
 
 		if !byChain {
-			gvg, err = vgm.chainClient.QueryGlobalVirtualGroup(context.Background(), gvg.Id)
+			gvgID := gvg.Id
+			gvg, err = vgm.chainClient.QueryGlobalVirtualGroup(context.Background(), gvgID)
 			if err != nil {
-				log.Errorw("failed to query global virtual group", "error", err)
+				log.Errorw("failed to query global virtual group", "gvg_id", gvgID, "error", err)
 				return
 			}
 			if !isEmpty(gvg) {
+				log.Warnw("the gvg is not empty by querying from chain ", "gvg", gvg)
 				return
 			}
 		}
@@ -584,8 +586,8 @@ func (vgm *virtualGroupManager) monitorGVGUsage(gvg *virtualgrouptypes.GlobalVir
 			return
 		}
 		safeDeleteTime = val.(int64)
-		log.Infow("GVG will be deleted at", "safe_delete_time", safeDeleteTime)
 		if curTime < safeDeleteTime {
+			log.Infow("GVG will be deleted at", "safe_delete_time", safeDeleteTime)
 			return
 		}
 		log.Infow("start to delete GVG", "GVG", gvg)
@@ -594,11 +596,11 @@ func (vgm *virtualGroupManager) monitorGVGUsage(gvg *virtualgrouptypes.GlobalVir
 			GlobalVirtualGroupId: gvg.Id,
 		})
 		if err != nil {
-			log.Errorw("failed to delete global virtual group", "gvgID", gvg.Id, "tx_hash", deleteGVGHash, "error", err)
+			log.Errorw("failed to delete global virtual group", "gvg_id", gvg.Id, "tx_hash", deleteGVGHash, "error", err)
 			return
 		}
 		vgm.gvgGCMap.Delete(gvg.Id)
-		log.Infow("GVG is deleted onchain", "GVG", gvg, "tx_hash", deleteGVGHash)
+		log.Infow("successfully delete GVG", "GVG", gvg, "tx_hash", deleteGVGHash)
 		deleted = true
 		return
 	}
@@ -615,23 +617,25 @@ func (vgm *virtualGroupManager) monitorGVGUsage(gvg *virtualgrouptypes.GlobalVir
 		},
 	}
 	if !byChain {
-		gvg, err = vgm.chainClient.QueryGlobalVirtualGroup(context.Background(), gvg.Id)
+		gvgID := gvg.Id
+		gvg, err = vgm.chainClient.QueryGlobalVirtualGroup(context.Background(), gvgID)
 		if err != nil {
-			log.Errorw("failed to query global virtual group", "error", err)
+			log.Errorw("failed to query global virtual group", "gvg_id", gvgID, "error", err)
 			return
 		}
 		if !needDeposit(gvg, vgParams) {
+			log.Warnw("the gvg does not need deposit by querying from chain", gvg, gvg)
 			return
 		}
 	}
 	log.Infow("found GVG need to deposit", "GVG", gvg)
 	var depositTxHash string
 	depositTxHash, err = vgm.gfspClient.Deposit(context.Background(), msgDeposit)
 	if err != nil {
-		log.Errorw("failed to deposit global virtual group", "gvgID", gvg.Id, "txHash", depositTxHash, "error", err)
+		log.Errorw("failed to deposit global virtual group", "gvg_id", gvg.Id, "tx_hash", depositTxHash, "error", err)
 		return
 	}
-	log.Infow("GVG is deposited", "GVG", gvg, "depositTxHash", depositTxHash)
+	log.Infow("successfully deposit GVG", "GVG", gvg, "tx_hash", depositTxHash)
 	deposited = true
 	return
 }