From 6923c4e24776db7053daa9f6dfb384b5efb3cb91 Mon Sep 17 00:00:00 2001 From: Luck Date: Tue, 23 Jan 2018 16:52:50 +0000 Subject: [PATCH] Log the name of the calculator when an exception is thrown --- .../contexts/AbstractContextManager.java | 14 ++++++- .../contexts/ProxiedContextCalculator.java | 37 +++++++++++++++++++ ...va => SpongeProxiedContextCalculator.java} | 14 +++++-- .../sponge/service/LuckPermsService.java | 7 ++-- 4 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 common/src/main/java/me/lucko/luckperms/common/contexts/ProxiedContextCalculator.java rename sponge/src/main/java/me/lucko/luckperms/sponge/contexts/{ProxiedContextCalculator.java => SpongeProxiedContextCalculator.java} (81%) diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/AbstractContextManager.java b/common/src/main/java/me/lucko/luckperms/common/contexts/AbstractContextManager.java index 43fb85d12..bb3dfd378 100644 --- a/common/src/main/java/me/lucko/luckperms/common/contexts/AbstractContextManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/contexts/AbstractContextManager.java @@ -186,7 +186,7 @@ public abstract class AbstractContextManager implements ContextManager { } accumulator = ret; } catch (Exception e) { - AbstractContextManager.this.plugin.getLog().warn("An exception was thrown whilst calculating the context of subject " + subject); + AbstractContextManager.this.plugin.getLog().warn("An exception was thrown by " + getCalculatorClass(calculator) + " whilst calculating the context of subject " + subject); e.printStackTrace(); } } @@ -209,7 +209,7 @@ public abstract class AbstractContextManager implements ContextManager { } accumulator = ret; } catch (Exception e) { - AbstractContextManager.this.plugin.getLog().warn("An exception was thrown whilst calculating static contexts"); + AbstractContextManager.this.plugin.getLog().warn("An exception was thrown by " + getCalculatorClass(calculator) + " whilst calculating static contexts"); e.printStackTrace(); } } @@ -218,4 +218,14 @@ public abstract class AbstractContextManager implements ContextManager { } } + private static String getCalculatorClass(ContextCalculator calculator) { + Class calculatorClass; + if (calculator instanceof ProxiedContextCalculator) { + calculatorClass = ((ProxiedContextCalculator) calculator).getDelegate().getClass(); + } else { + calculatorClass = calculator.getClass(); + } + return calculatorClass.getName(); + } + } diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/ProxiedContextCalculator.java b/common/src/main/java/me/lucko/luckperms/common/contexts/ProxiedContextCalculator.java new file mode 100644 index 000000000..f463868f7 --- /dev/null +++ b/common/src/main/java/me/lucko/luckperms/common/contexts/ProxiedContextCalculator.java @@ -0,0 +1,37 @@ +/* + * This file is part of LuckPerms, licensed under the MIT License. + * + * Copyright (c) lucko (Luck) + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package me.lucko.luckperms.common.contexts; + +import me.lucko.luckperms.api.context.ContextCalculator; + +/** + * Represents a {@link ContextCalculator} which delegates calls to another object. + */ +public interface ProxiedContextCalculator extends ContextCalculator { + + Object getDelegate(); + +} diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/ProxiedContextCalculator.java b/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeProxiedContextCalculator.java similarity index 81% rename from sponge/src/main/java/me/lucko/luckperms/sponge/contexts/ProxiedContextCalculator.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeProxiedContextCalculator.java index a368b8882..c4181ad4a 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/ProxiedContextCalculator.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeProxiedContextCalculator.java @@ -25,21 +25,22 @@ package me.lucko.luckperms.sponge.contexts; -import me.lucko.luckperms.api.context.ContextCalculator; import me.lucko.luckperms.api.context.MutableContextSet; +import me.lucko.luckperms.common.contexts.ProxiedContextCalculator; import me.lucko.luckperms.sponge.service.context.DelegatingMutableContextSet; import org.spongepowered.api.service.context.Context; +import org.spongepowered.api.service.context.ContextCalculator; import org.spongepowered.api.service.permission.Subject; import java.util.Set; import javax.annotation.Nonnull; -public class ProxiedContextCalculator implements ContextCalculator { - private final org.spongepowered.api.service.context.ContextCalculator delegate; +public class SpongeProxiedContextCalculator implements ProxiedContextCalculator { + private final ContextCalculator delegate; - public ProxiedContextCalculator(org.spongepowered.api.service.context.ContextCalculator delegate) { + public SpongeProxiedContextCalculator(ContextCalculator delegate) { this.delegate = delegate; } @@ -51,4 +52,9 @@ public class ProxiedContextCalculator implements ContextCalculator { return accumulator; } + @Override + public Object getDelegate() { + return this.delegate; + } + } diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java index 84e2d84ae..453c417e1 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java @@ -34,7 +34,7 @@ import com.google.common.collect.ImmutableSet; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.utils.Predicates; import me.lucko.luckperms.sponge.LPSpongePlugin; -import me.lucko.luckperms.sponge.contexts.ProxiedContextCalculator; +import me.lucko.luckperms.sponge.contexts.SpongeProxiedContextCalculator; import me.lucko.luckperms.sponge.managers.SpongeGroupManager; import me.lucko.luckperms.sponge.managers.SpongeUserManager; import me.lucko.luckperms.sponge.service.legacy.LegacyDataMigrator; @@ -48,6 +48,7 @@ import me.lucko.luckperms.sponge.service.reference.SubjectReferenceFactory; import me.lucko.luckperms.sponge.service.storage.SubjectStorage; import org.spongepowered.api.plugin.PluginContainer; +import org.spongepowered.api.service.context.ContextCalculator; import org.spongepowered.api.service.permission.PermissionService; import org.spongepowered.api.service.permission.Subject; import org.spongepowered.api.text.Text; @@ -205,9 +206,9 @@ public class LuckPermsService implements LPPermissionService { } @Override - public void registerContextCalculator(org.spongepowered.api.service.context.ContextCalculator calculator) { + public void registerContextCalculator(ContextCalculator calculator) { Objects.requireNonNull(calculator); - this.plugin.getContextManager().registerCalculator(new ProxiedContextCalculator(calculator)); + this.plugin.getContextManager().registerCalculator(new SpongeProxiedContextCalculator(calculator)); } @Override