Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-12 15:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Upstream

Browse Source 
609c7b8 Scrapped Logging Framework 4 Java

Closes #997
Closes #998
Closes #999
Closes #1000
Closes #1001
Closes #1002
This commit is contained in:
NotMyFault
2021-03-29 15:29:16 +02:00
parent 2dc89f735d
commit b96cea75b8
118 changed files with 700 additions and 743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java
View File

@ -31,6 +31,7 @@ import com.sk89q.worldedit.command.tool.Tool;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.event.platform.ConfigurationLoadEvent;
import com.sk89q.worldedit.extension.platform.Locatable;
import com.sk89q.worldedit.internal.util.LogManagerCompat;
import com.sk89q.worldedit.session.request.Request;
import com.sk89q.worldedit.session.storage.JsonFileSessionStore;
import com.sk89q.worldedit.session.storage.SessionStore;
@ -40,8 +41,7 @@ import com.sk89q.worldedit.util.eventbus.Subscribe;
import com.sk89q.worldedit.world.gamemode.GameModes;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import java.io.File;
import java.io.IOException;
@ -69,7 +69,7 @@ public class SessionManager {
private static final int FLUSH_PERIOD = 1000 * 30;
private static final ListeningExecutorService executorService = MoreExecutors.listeningDecorator(
EvenMoreExecutors.newBoundedCachedThreadPool(0, 1, 5, "WorldEdit Session Saver - %s"));
private static final Logger log = LoggerFactory.getLogger(SessionManager.class);
private static final Logger LOGGER = LogManagerCompat.getLogger();
private static boolean warnedInvalidTool;
private final Timer timer = new Timer("WorldEdit Session Manager");
@ -157,7 +157,7 @@ public class SessionManager {
session = store.load(getKey(sessionKey));
session.postLoad();
} catch (IOException e) {
log.warn("Failed to load saved session", e);
LOGGER.warn("Failed to load saved session", e);
session = new LocalSession();
}
Request.request().setSession(session);
@ -252,7 +252,7 @@ public class SessionManager {
try {
store.save(getKey(key), entry.getValue());
} catch (IOException e) {
log.warn("Failed to write session for UUID " + getKey(key), e);
LOGGER.warn("Failed to write session for UUID " + getKey(key), e);
exception = e;
}
}

16
worldedit-core/src/main/java/com/sk89q/worldedit/session/storage/JsonFileSessionStore.java
View File

@ -24,10 +24,10 @@ import com.google.gson.GsonBuilder;
import com.google.gson.JsonIOException;
import com.google.gson.JsonParseException;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.internal.util.LogManagerCompat;
import com.sk89q.worldedit.util.gson.GsonUtil;
import com.sk89q.worldedit.util.io.Closer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@ -47,7 +47,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/
public class JsonFileSessionStore implements SessionStore {
private static final Logger log = LoggerFactory.getLogger(JsonFileSessionStore.class);
private static final Logger LOGGER = LogManagerCompat.getLogger();
private final Gson gson;
private final File dir;
@ -61,7 +61,7 @@ public class JsonFileSessionStore implements SessionStore {
if (!dir.isDirectory()) {
if (!dir.mkdirs()) {
log.warn("Failed to create directory '" + dir.getPath() + "' for sessions");
LOGGER.warn("Failed to create directory '" + dir.getPath() + "' for sessions");
}
}
@ -90,9 +90,9 @@ public class JsonFileSessionStore implements SessionStore {
BufferedReader br = closer.register(new BufferedReader(fr));
LocalSession session = gson.fromJson(br, LocalSession.class);
if (session == null) {
log.warn("Loaded a null session from {}, creating new session", file);
LOGGER.warn("Loaded a null session from {}, creating new session", file);
if (!file.delete()) {
log.warn("Failed to delete corrupted session {}", file);
LOGGER.warn("Failed to delete corrupted session {}", file);
}
session = new LocalSession();
}
@ -120,7 +120,7 @@ public class JsonFileSessionStore implements SessionStore {
if (finalFile.exists()) {
if (!finalFile.delete()) {
log.warn("Failed to delete " + finalFile.getPath() + " so the .tmp file can replace it");
LOGGER.warn("Failed to delete " + finalFile.getPath() + " so the .tmp file can replace it");
}
}
@ -129,7 +129,7 @@ public class JsonFileSessionStore implements SessionStore {
}
if (!tempFile.renameTo(finalFile)) {
log.warn("Failed to rename temporary session file to " + finalFile.getPath());
LOGGER.warn("Failed to rename temporary session file to " + finalFile.getPath());
}
}