Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-22 17:18:37 +01:00
Code Issues Projects Releases Wiki Activity

Make usermap non-player warnings configurable (#5125)

Browse Source 
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
This commit is contained in:
MD 2022-10-11 02:06:54 +01:00 committed by GitHub
parent e91ce0c44c
commit dc7fb91939
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Essentials/src/main/java/com/earth2me/essentials/userstorage/ModernUserMap.java
View File

@ -2,6 +2,7 @@ package com.earth2me.essentials.userstorage;
import com.earth2me.essentials.OfflinePlayer; import com.earth2me.essentials.OfflinePlayer;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.NumberUtil;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
@ -12,7 +13,10 @@ import java.io.File;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicLong;
import java.util.logging.Level; import java.util.logging.Level;
public class ModernUserMap extends CacheLoader<UUID, User> implements IUserMap { public class ModernUserMap extends CacheLoader<UUID, User> implements IUserMap {
@ -20,6 +24,10 @@ public class ModernUserMap extends CacheLoader<UUID, User> implements IUserMap {
private final transient ModernUUIDCache uuidCache; private final transient ModernUUIDCache uuidCache;
private final transient LoadingCache<UUID, User> userCache; private final transient LoadingCache<UUID, User> userCache;
private final boolean debugPrintStackWithWarn;
private final long debugMaxWarnsPerType;
private final ConcurrentMap<String, AtomicLong> debugNonPlayerWarnCounts;
public ModernUserMap(final IEssentials ess) { public ModernUserMap(final IEssentials ess) {
this.ess = ess; this.ess = ess;
this.uuidCache = new ModernUUIDCache(ess); this.uuidCache = new ModernUUIDCache(ess);
@ -27,6 +35,15 @@ public class ModernUserMap extends CacheLoader<UUID, User> implements IUserMap {
.maximumSize(ess.getSettings().getMaxUserCacheCount()) .maximumSize(ess.getSettings().getMaxUserCacheCount())
.softValues() .softValues()
.build(this); .build(this);
// -Dnet.essentialsx.usermap.print-stack=true
final String printStackProperty = System.getProperty("net.essentialsx.usermap.print-stack", "false");
// -Dnet.essentialsx.usermap.max-warns=20
final String maxWarnProperty = System.getProperty("net.essentialsx.usermap.max-warns", "100");
this.debugMaxWarnsPerType = NumberUtil.isLong(maxWarnProperty) ? Long.parseLong(maxWarnProperty) : -1;
this.debugPrintStackWithWarn = Boolean.parseBoolean(printStackProperty);
this.debugNonPlayerWarnCounts = new ConcurrentHashMap<>();
} }
@Override @Override
@ -111,7 +128,7 @@ public class ModernUserMap extends CacheLoader<UUID, User> implements IUserMap {
User user = getUser(base.getUniqueId()); User user = getUser(base.getUniqueId());
if (user == null) { if (user == null) {
ess.getLogger().log(Level.INFO, "Essentials created a User for " + base.getName() + " (" + base.getUniqueId() + ") for non Bukkit type: " + base.getClass().getName()); debugLogUncachedNonPlayer(base);
user = new User(base, ess); user = new User(base, ess);
} else if (!base.equals(user.getBase())) { } else if (!base.equals(user.getBase())) {
ess.getLogger().log(Level.INFO, "Essentials updated the underlying Player object for " + user.getUUID()); ess.getLogger().log(Level.INFO, "Essentials updated the underlying Player object for " + user.getUUID());
@ -178,4 +195,16 @@ public class ModernUserMap extends CacheLoader<UUID, User> implements IUserMap {
public void shutdown() { public void shutdown() {
uuidCache.shutdown(); uuidCache.shutdown();
} }
private void debugLogUncachedNonPlayer(final Player base) {
final String typeName = base.getClass().getName();
final long count = debugNonPlayerWarnCounts.computeIfAbsent(typeName, name -> new AtomicLong(0)).getAndIncrement();
if (debugMaxWarnsPerType < 0 || count <= debugMaxWarnsPerType) {
final Throwable throwable = debugPrintStackWithWarn ? new Throwable() : null;
ess.getLogger().log(Level.INFO, "Created a User for " + base.getName() + " (" + base.getUniqueId() + ") for non Bukkit type: " + typeName, throwable);
if (count == debugMaxWarnsPerType) {
ess.getLogger().log(Level.WARNING, "Essentials will not log any more warnings for " + typeName + ". Please report this to the EssentialsX team.");
}
}
}
} }