Skip to content

Commit de576be

Browse files
Update changelog and move rollbar reporting to a more restrictive executor. (#2422)
1 parent 43b662a commit de576be

3 files changed

Lines changed: 22 additions & 2 deletions

File tree

.changelog/SNAPSHOTS/6.3.0.0-SNAPSHOT-10.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ Conditional components dynamically determine their output based on the current s
3939
- **Unlimited** when the shop has unlimited stock.
4040
- The remaining stock amount when the shop has available stock.
4141

42+
## Internal Changes
43+
- Moved rollbar reporting to a more restrictive executor.
44+
4245
## Minor Changes
4346
- renamed price to price_solo for text-display configurations.
4447
- Added support for displaying the name of the song on a music disc using shop.use-song-for-disc-item in config.yml
@@ -53,4 +56,7 @@ Conditional components dynamically determine their output based on the current s
5356
- Deprecated IShopLayoutProvider#renderTrading
5457
- Deprecated IShopLayoutProvider#renderItem
5558
- Deprecated IShopLayoutProvider#renderPrice
56-
- Deprecated IShopLayoutProvider#renderLevels
59+
- Deprecated IShopLayoutProvider#renderLevels
60+
61+
## Fixes
62+
- Fix ShopBenefitAddEvent not showing the cancel message(thanks to Warriorrrr)

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/util/reporter/error/RollbarErrorReporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public void resetIgnores() {
238238
*/
239239
public void sendError(@NotNull final Throwable throwable, @NotNull final String... context) {
240240

241-
QuickExecutor.getCommonExecutor().submit(()->sendError0(throwable, context));
241+
QuickExecutor.getErrorReportExecutor().submit(()->sendError0(throwable, context));
242242
}
243243

244244
/**

quickshop-common/src/main/java/com/ghostchu/quickshop/common/util/QuickExecutor.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ public class QuickExecutor {
1414
private static ExecutorService COMMON_EXECUTOR = Executors.newCachedThreadPool();
1515
private static ExecutorService PRIMARY_PROFILE_IO_EXECUTOR = Executors.newWorkStealingPool(16);
1616
private static ExecutorService SECONDARY_PROFILE_IO_EXECUTOR = Executors.newWorkStealingPool(2);
17+
private static final ExecutorService ERROR_REPORT_EXECUTOR = new ThreadPoolExecutor(
18+
1,
19+
1,
20+
60L,
21+
TimeUnit.SECONDS,
22+
new LinkedBlockingQueue<>(100),r -> {
23+
Thread t = new Thread(r, "QuickShop-ErrorReporter");
24+
t.setDaemon(true);
25+
return t;
26+
}, new ThreadPoolExecutor.DiscardPolicy());
1727

1828
static {
1929
HIKARICP_EXECUTOR = provideHikariCPExecutor();
@@ -35,6 +45,10 @@ public static ExecutorService provideHikariCPExecutor() {
3545
return Executors.newThreadPerTaskExecutor(Thread.ofVirtual().name("QuickShop-Database-Worker-", 0).factory());
3646
}
3747

48+
public static ExecutorService getErrorReportExecutor() {
49+
return ERROR_REPORT_EXECUTOR;
50+
}
51+
3852
public static ExecutorService getCommonExecutor() {
3953

4054
return COMMON_EXECUTOR;

0 commit comments

Comments
 (0)