Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-07-05 02:54:43 +02:00
Code Issues Projects Releases Wiki Activity

Log the name of the calculator when an exception is thrown

Browse Source
This commit is contained in:
Luck 2018-01-23 16:52:50 +00:00
parent 0eba5f1cbc
commit 6923c4e247
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
4 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/main/java/me/lucko/luckperms/common/contexts/AbstractContextManager.java
View File

@ -186,7 +186,7 @@ public abstract class AbstractContextManager<T> implements ContextManager<T> {
}
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<T> implements ContextManager<T> {
}
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<T> implements ContextManager<T> {
}
}
private static String getCalculatorClass(ContextCalculator<?> calculator) {
Class<?> calculatorClass;
if (calculator instanceof ProxiedContextCalculator) {
calculatorClass = ((ProxiedContextCalculator) calculator).getDelegate().getClass();
} else {
calculatorClass = calculator.getClass();
}
return calculatorClass.getName();
}
}

37
common/src/main/java/me/lucko/luckperms/common/contexts/ProxiedContextCalculator.java Normal file
View File

@ -0,0 +1,37 @@
/*
* This file is part of LuckPerms, licensed under the MIT License.
*
* Copyright (c) lucko (Luck) <luck@lucko.me>
* 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<T> extends ContextCalculator<T> {
Object getDelegate();
}

14
sponge/src/main/java/me/lucko/luckperms/sponge/contexts/ProxiedContextCalculator.java → sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeProxiedContextCalculator.java
View File

@ -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<Subject> {
private final org.spongepowered.api.service.context.ContextCalculator<Subject> delegate;
public class SpongeProxiedContextCalculator implements ProxiedContextCalculator<Subject> {
private final ContextCalculator<Subject> delegate;
public ProxiedContextCalculator(org.spongepowered.api.service.context.ContextCalculator<Subject> delegate) {
public SpongeProxiedContextCalculator(ContextCalculator<Subject> delegate) {
this.delegate = delegate;
}
@ -51,4 +52,9 @@ public class ProxiedContextCalculator implements ContextCalculator<Subject> {
return accumulator;
}
@Override
public Object getDelegate() {
return this.delegate;
}
}

7
sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java
View File

@ -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<Subject> calculator) {
public void registerContextCalculator(ContextCalculator<Subject> calculator) {
Objects.requireNonNull(calculator);
this.plugin.getContextManager().registerCalculator(new ProxiedContextCalculator(calculator));
this.plugin.getContextManager().registerCalculator(new SpongeProxiedContextCalculator(calculator));
}
@Override