Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-12-01 13:23:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Introduce a lock to debug log writing

Browse Source
This commit is contained in:
Vankka 2022-02-01 12:47:24 +02:00
parent 0a128e37e9
commit 3ff0c80e9a
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/src/main/java/com/discordsrv/common/logging/impl/DiscordSRVLogger.java
View File

@ -37,6 +37,7 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
public class DiscordSRVLogger implements Logger { public class DiscordSRVLogger implements Logger {
@ -47,6 +48,7 @@ public class DiscordSRVLogger implements Logger {
private final DiscordSRV discordSRV; private final DiscordSRV discordSRV;
private final Path logsDirectory; private final Path logsDirectory;
private final List<Path> debugLogs; private final List<Path> debugLogs;
private final ReentrantLock debugLogLock = new ReentrantLock();
public DiscordSRVLogger(DiscordSRV discordSRV) { public DiscordSRVLogger(DiscordSRV discordSRV) {
this.discordSRV = discordSRV; this.discordSRV = discordSRV;
@ -126,14 +128,6 @@ public class DiscordSRVLogger implements Logger {
private void writeToFile(String loggerName, Path path, long time, LogLevel logLevel, String message, Throwable throwable) { private void writeToFile(String loggerName, Path path, long time, LogLevel logLevel, String message, Throwable throwable) {
try { try {
Path parent = path.getParent();
if (!Files.exists(parent)) {
Files.createDirectories(parent);
}
if (!Files.exists(path)) {
Files.createFile(path);
}
if (message == null) { if (message == null) {
message = ""; message = "";
} }
@ -147,7 +141,22 @@ public class DiscordSRVLogger implements Logger {
line += ExceptionUtils.getStackTrace(throwable) + "\n"; line += ExceptionUtils.getStackTrace(throwable) + "\n";
} }
synchronized (debugLogLock) {
try {
debugLogLock.lock();
Path parent = path.getParent();
if (!Files.exists(parent)) {
Files.createDirectories(parent);
}
if (!Files.exists(path)) {
Files.createFile(path);
}
Files.write(path, line.getBytes(StandardCharsets.UTF_8), StandardOpenOption.APPEND); Files.write(path, line.getBytes(StandardCharsets.UTF_8), StandardOpenOption.APPEND);
} finally {
debugLogLock.unlock();
}
}
} catch (Throwable e) { } catch (Throwable e) {
// Prevent infinite loop // Prevent infinite loop
discordSRV.platformLogger().error("Failed to write to debug log", e); discordSRV.platformLogger().error("Failed to write to debug log", e);