Merge pull request #11434 from vegaprotocol/11399-reduce-logs

fix: demote order-spam logs to debug and avoid data-node warning log
vegaprotocol · Jul 10, 2024 · f3d2d75 · f3d2d75
2 parents 244a187 + 1ed6a84
commit f3d2d75
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/core/collateral/engine.go b/core/collateral/engine.go
@@ -211,7 +211,10 @@ func (e *Engine) CheckOrderSpamAllMarkets(party string) error {
 func (e *Engine) CheckOrderSpam(party, market string, assets []string) error {
 	e.cacheLock.RLock()
 	defer e.cacheLock.RUnlock()
-	e.log.Info("CheckOrderSpam", logging.String("party", party), logging.String("market", market), logging.Strings("assets", assets))
+
+	if e.log.IsDebug() {
+		e.log.Debug("CheckOrderSpam", logging.String("party", party), logging.String("market", market), logging.Strings("assets", assets))
+	}
 	if assetBalances, ok := e.partyAssetCache[party]; !ok {
 		return fmt.Errorf("party " + party + " is not eligible to submit order transactions in market " + market + " (no general account in no asset)")
 	} else {
@@ -225,8 +228,10 @@ func (e *Engine) CheckOrderSpam(party, market string, assets []string) error {
 			}
 		}
 		if !found {
-			for ast, balance := range e.partyAssetCache[party] {
-				e.log.Info("party asset cache", logging.String("party", party), logging.String("asset", ast), logging.String("balance", balance.String()))
+			if e.log.IsDebug() {
+				for ast, balance := range e.partyAssetCache[party] {
+					e.log.Debug("party asset cache", logging.String("party", party), logging.String("asset", ast), logging.String("balance", balance.String()))
+				}
 			}
 			return fmt.Errorf("party " + party + " is not eligible to submit order transactions in market " + market + " (no general account found)")
 		}

diff --git a/datanode/sqlsubscribers/order.go b/datanode/sqlsubscribers/order.go
@@ -142,11 +142,15 @@ func (os *Order) cancelled(ctx context.Context, co CancelledOrdersEvent, seqNum
 			ids = append(ids, id)
 		}
 	}
-	ncOrders, err := os.store.GetByMarketAndID(ctx, co.MarketID(), ids)
-	if err != nil {
-		return err
+
+	if len(ids) > 0 {
+		ncOrders, err := os.store.GetByMarketAndID(ctx, co.MarketID(), ids)
+		if err != nil {
+			return err
+		}
+		orders = append(orders, ncOrders...)
 	}
-	orders = append(orders, ncOrders...)
+
 	txHash := entities.TxHash(co.TxHash())
 	for _, o := range orders {
 		o.Status = entities.OrderStatusCancelled