Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-04 09:27:27 +02:00
Code Issues Projects Releases Wiki Activity

Moved shutdown session save message to ServerShutdownSave

Browse Source
This commit is contained in:
Rsl1122 2019-02-24 12:41:07 +02:00
parent 16e6ef1dc7
commit 42464d503e
5 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Plan/bukkit/src/main/java/com/djrapitops/plan/BukkitServerShutdownSave.java
View File

@ -17,6 +17,7 @@
package com.djrapitops.plan;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plan.utilities.java.Reflection;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
@ -32,16 +33,14 @@ import javax.inject.Singleton;
@Singleton
public class BukkitServerShutdownSave extends ServerShutdownSave {
private final PluginLogger logger;
@Inject
public BukkitServerShutdownSave(
Locale locale,
DBSystem dbSystem,
PluginLogger logger,
ErrorHandler errorHandler
) {
super(dbSystem, errorHandler);
this.logger = logger;
super(locale, dbSystem, logger, errorHandler);
}
@Override

1
Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java
View File

@ -91,7 +91,6 @@ public class Plan extends BukkitPlugin implements PlanPlugin {
@Override
public void onDisable() {
if (serverShutdownSave != null) {
logger.info(locale != null ? locale.getString(PluginLang.DISABLED_UNSAVED_SESSIONS) : PluginLang.DISABLED_UNSAVED_SESSIONS.getDefault());
serverShutdownSave.performSave();
}
if (system != null) {

14
Plan/common/src/main/java/com/djrapitops/plan/ServerShutdownSave.java
View File

@ -24,7 +24,10 @@ import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.db.access.transactions.events.ServerShutdownTransaction;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plan.system.locale.lang.PluginLang;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import java.util.Map;
@ -39,15 +42,21 @@ import java.util.concurrent.ExecutionException;
*/
public abstract class ServerShutdownSave {
protected final PluginLogger logger;
private final DBSystem dbSystem;
private final Locale locale;
private final ErrorHandler errorHandler;
private boolean shuttingDown = false;
public ServerShutdownSave(
Locale locale,
DBSystem dbSystem,
PluginLogger logger,
ErrorHandler errorHandler
) {
this.locale = locale;
this.dbSystem = dbSystem;
this.logger = logger;
this.errorHandler = errorHandler;
}
@ -67,6 +76,11 @@ public abstract class ServerShutdownSave {
return;
}
// This check ensures that logging is not attempted on JVM shutdown.
// Underlying Logger might not be available leading to an exception.
if (!shuttingDown) {
logger.info(locale.getString(PluginLang.DISABLED_UNSAVED_SESSIONS));
}
attemptSave(activeSessions);
SessionCache.clear();

4
Plan/common/src/test/java/com/djrapitops/plan/ShutdownSaveTest.java
View File

@ -27,6 +27,7 @@ import com.djrapitops.plan.db.access.transactions.events.WorldNameStoreTransacti
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.Server;
import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plugin.logging.console.TestPluginLogger;
import com.djrapitops.plugin.logging.error.ConsoleErrorLogger;
import extension.PrintExtension;
@ -84,7 +85,8 @@ public class ShutdownSaveTest {
DBSystem dbSystemMock = mock(DBSystem.class);
when(dbSystemMock.getDatabase()).thenReturn(database);
underTest = new ServerShutdownSave(dbSystemMock, new ConsoleErrorLogger(new TestPluginLogger())) {
TestPluginLogger logger = new TestPluginLogger();
underTest = new ServerShutdownSave(new Locale(), dbSystemMock, logger, new ConsoleErrorLogger(logger)) {
@Override
protected boolean checkServerShuttingDownStatus() {
return shutdownStatus;

11
Plan/sponge/src/main/java/com/djrapitops/plan/SpongeServerShutdownSave.java
View File

@ -17,6 +17,8 @@
package com.djrapitops.plan;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import org.spongepowered.api.GameState;
import org.spongepowered.api.event.Listener;
@ -37,8 +39,13 @@ public class SpongeServerShutdownSave extends ServerShutdownSave {
private boolean shuttingDown = false;
@Inject
public SpongeServerShutdownSave(DBSystem dbSystem, ErrorHandler errorHandler) {
super(dbSystem, errorHandler);
public SpongeServerShutdownSave(
Locale locale,
DBSystem dbSystem,
PluginLogger logger,
ErrorHandler errorHandler
) {
super(locale, dbSystem, logger, errorHandler);
}
@Override