Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-10-31 08:32:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix parameters in slf4j implementation

Browse Source
This commit is contained in:
Vankka 2022-01-15 14:03:08 +02:00
parent 595146cc5b
commit d3faafcece
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
common/api/src/main/java/com/discordsrv/common/logging/adapter/DependencyLoggerAdapter.java
View File

@ -22,6 +22,7 @@ import com.discordsrv.common.logging.LogAppender;
import com.discordsrv.common.logging.LogLevel; import com.discordsrv.common.logging.LogLevel;
import org.slf4j.Marker; import org.slf4j.Marker;
import org.slf4j.helpers.MarkerIgnoringBase; import org.slf4j.helpers.MarkerIgnoringBase;
import org.slf4j.helpers.MessageFormatter;
import org.slf4j.spi.LocationAwareLogger; import org.slf4j.spi.LocationAwareLogger;
public class DependencyLoggerAdapter extends MarkerIgnoringBase implements LocationAwareLogger { public class DependencyLoggerAdapter extends MarkerIgnoringBase implements LocationAwareLogger {
@ -38,13 +39,25 @@ public class DependencyLoggerAdapter extends MarkerIgnoringBase implements Locat
this.name = name; this.name = name;
} }
private String format(String message, Object arg1) {
return MessageFormatter.format(message, arg1).getMessage();
}
private String format(String message, Object arg1, Object arg2) {
return MessageFormatter.format(message, arg1, arg2).getMessage();
}
private String format(String message, Object[] arguments) {
return MessageFormatter.arrayFormat(message, arguments).getMessage();
}
@Override @Override
public void log(Marker marker, String fqcn, int level, String message, Object[] argArray, Throwable t) { public void log(Marker marker, String fqcn, int level, String message, Object[] argArray, Throwable t) {
if (APPENDER == null) { if (APPENDER == null) {
// Adapter isn't set, do nothing // Adapter isn't set, do nothing
return; return;
} }
APPENDER.append(name, getLevel(level), String.format(message, argArray), t); APPENDER.append(name, getLevel(level), format(message, argArray), t);
} }
private LogLevel getLevel(int level) { private LogLevel getLevel(int level) {
@ -72,22 +85,21 @@ public class DependencyLoggerAdapter extends MarkerIgnoringBase implements Locat
@Override @Override
public void trace(String msg) { public void trace(String msg) {
trace(msg, (Throwable) null); trace(msg, (Throwable) null);
} }
@Override @Override
public void trace(String format, Object arg) { public void trace(String format, Object arg) {
trace(String.format(format, arg)); trace(format(format, arg));
} }
@Override @Override
public void trace(String format, Object arg1, Object arg2) { public void trace(String format, Object arg1, Object arg2) {
trace(String.format(format, arg1, arg2)); trace(format(format, arg1, arg2));
} }
@Override @Override
public void trace(String format, Object... arguments) { public void trace(String format, Object... arguments) {
trace(String.format(format, arguments)); trace(format(format, arguments));
} }
@Override @Override
@ -107,17 +119,17 @@ public class DependencyLoggerAdapter extends MarkerIgnoringBase implements Locat
@Override @Override
public void debug(String format, Object arg) { public void debug(String format, Object arg) {
debug(String.format(format, arg)); debug(format(format, arg));
} }
@Override @Override
public void debug(String format, Object arg1, Object arg2) { public void debug(String format, Object arg1, Object arg2) {
debug(String.format(format, arg1, arg2)); debug(format(format, arg1, arg2));
} }
@Override @Override
public void debug(String format, Object... arguments) { public void debug(String format, Object... arguments) {
debug(String.format(format, arguments)); debug(format(format, arguments));
} }
@Override @Override
@ -137,17 +149,17 @@ public class DependencyLoggerAdapter extends MarkerIgnoringBase implements Locat
@Override @Override
public void info(String format, Object arg) { public void info(String format, Object arg) {
info(String.format(format, arg)); info(format(format, arg));
} }
@Override @Override
public void info(String format, Object arg1, Object arg2) { public void info(String format, Object arg1, Object arg2) {
info(String.format(format, arg1, arg2)); info(format(format, arg1, arg2));
} }
@Override @Override
public void info(String format, Object... arguments) { public void info(String format, Object... arguments) {
info(String.format(format, arguments)); info(format(format, arguments));
} }
@Override @Override
@ -167,17 +179,17 @@ public class DependencyLoggerAdapter extends MarkerIgnoringBase implements Locat
@Override @Override
public void warn(String format, Object arg) { public void warn(String format, Object arg) {
warn(String.format(format, arg)); warn(format(format, arg));
} }
@Override @Override
public void warn(String format, Object... arguments) { public void warn(String format, Object... arguments) {
warn(String.format(format, arguments)); warn(format(format, arguments));
} }
@Override @Override
public void warn(String format, Object arg1, Object arg2) { public void warn(String format, Object arg1, Object arg2) {
warn(String.format(format, arg1, arg2)); warn(format(format, arg1, arg2));
} }
@Override @Override
@ -197,17 +209,17 @@ public class DependencyLoggerAdapter extends MarkerIgnoringBase implements Locat
@Override @Override
public void error(String format, Object arg) { public void error(String format, Object arg) {
error(String.format(format, arg)); error(format(format, arg));
} }
@Override @Override
public void error(String format, Object arg1, Object arg2) { public void error(String format, Object arg1, Object arg2) {
error(String.format(format, arg1, arg2)); error(format(format, arg1, arg2));
} }
@Override @Override
public void error(String format, Object... arguments) { public void error(String format, Object... arguments) {
error(String.format(format, arguments)); error(format(format, arguments));
} }
@Override @Override

4
common/api/src/main/java/org/slf4j/impl/package-info.java Normal file
View File

@ -0,0 +1,4 @@
/**
* DiscordSRV's own implementation of SLF4J (relocated during runtime) that forwards log messages to the server's logger.
*/
package org.slf4j.impl;