Skip to content

Fix Discord Link RoleSyncManager thread leak #6512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JRoy wants to merge 1 commit into
base: 2.x
Choose a base branch
from
+27 −3
Open

Fix Discord Link RoleSyncManager thread leak #6512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions EssentialsDiscordLink/src/main/java/net/essentialsx/discordlink/EssentialsDiscordLink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ public void onEnable() {

@Override
public void onDisable() {
if (roleSyncManager != null) {
roleSyncManager.shutdown();
}
if (accounts != null) {
accounts.shutdown();
}
Expand Down
27 changes: 24 additions & 3 deletions ...ntialsDiscordLink/src/main/java/net/essentialsx/discordlink/rolesync/RoleSyncManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.scheduler.BukkitTask;

import java.util.ArrayList;
import java.util.Collections;
Expand All @@ -19,6 +20,7 @@
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;

import static com.earth2me.essentials.I18n.tlLiteral;
Expand All @@ -28,13 +30,14 @@ public class RoleSyncManager implements Listener {
private final Map<String, InteractionRole> groupToRoleMap = new HashMap<>();
private final Map<String, String> roleIdToGroupMap = new HashMap<>();
private final Semaphore syncSemaphore = new Semaphore(5);
private BukkitTask syncTask;
private int syncCursor = 0;

public RoleSyncManager(final EssentialsDiscordLink ess) {
this.ess = ess;
Bukkit.getPluginManager().registerEvents(this, ess);
onReload();
this.ess.getEss().runTaskTimerAsynchronously(() -> {
this.syncTask = this.ess.getEss().runTaskTimerAsynchronously(() -> {
if (groupToRoleMap.isEmpty() && roleIdToGroupMap.isEmpty()) {
return;
}
Expand Down Expand Up @@ -67,6 +70,12 @@ public RoleSyncManager(final EssentialsDiscordLink ess) {
}, 0, ess.getSettings().getRoleSyncResyncDelay() * 1200L);
}

public void shutdown() {
if (syncTask != null) {
syncTask.cancel();
}
}

public void sync(final UUID uuid, final String discordId) {
final Map<String, InteractionRole> groupToRoleMapCopy = new HashMap<>(groupToRoleMap);
final Map<String, String> roleIdToGroupMapCopy = new HashMap<>(roleIdToGroupMap);
Expand All @@ -81,7 +90,13 @@ public void sync(final Player player, final String discordId, final Map<String,
final List<String> groups = primaryOnly ?
Collections.singletonList(ess.getEss().getPermissionsHandler().getGroup(player)) : ess.getEss().getPermissionsHandler().getGroups(player);
ess.getEss().runTaskAsynchronously(() -> {
syncSemaphore.acquireUninterruptibly();
try {
if (!syncSemaphore.tryAcquire(5, TimeUnit.SECONDS)) {
return;
}
} catch (final InterruptedException e) {
return;
}
ess.getApi().getMemberById(discordId).thenCompose(member -> {
if (member == null) {
if (ess.getSettings().isUnlinkOnLeave()) {
Expand Down Expand Up @@ -151,7 +166,13 @@ public void unSync(final UUID uuid, final String discordId) {
}

ess.getEss().runTaskAsynchronously(() -> {
syncSemaphore.acquireUninterruptibly();
try {
if (!syncSemaphore.tryAcquire(5, TimeUnit.SECONDS)) {
return;
}
} catch (final InterruptedException e) {
return;
}
ess.getApi().getMemberById(discordId).thenCompose(member -> {
// Check if the member is no longer in the guild (null), they don't have any roles anyway.
if (member == null) {
Expand Down
Loading