Merge remote-tracking branch 'origin/master' into close-write

2023-01-02 16:42:21 +08:00
parent 6ae7cdab64 cf6593ff50
commit 83554afebc
27 changed files with 3384 additions and 1979 deletions
@@ -69,7 +69,7 @@ func MessagePool(lc fx.Lifecycle, mctx helpers.MetricsCtx, us stmgr.UpgradeSched
 			return mp.Close()
 		},
 	})
-	protector.AddProtector(mp.ForEachPendingMessage)
+	protector.AddProtector(mp.TryForEachPendingMessage)
 	return mp, nil
 }