diff --git a/Plan/common/src/main/java/com/djrapitops/plan/commands/TabCompleteCache.java b/Plan/common/src/main/java/com/djrapitops/plan/commands/TabCompleteCache.java index d98d05a90..35f767951 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/commands/TabCompleteCache.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/commands/TabCompleteCache.java @@ -20,6 +20,7 @@ import com.djrapitops.plan.SubSystem; import com.djrapitops.plan.delivery.domain.auth.User; import com.djrapitops.plan.identification.Server; import com.djrapitops.plan.identification.ServerUUID; +import com.djrapitops.plan.processing.Processing; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.queries.objects.ServerQueries; import com.djrapitops.plan.storage.database.queries.objects.UserIdentifierQueries; @@ -39,6 +40,7 @@ import java.util.stream.Collectors; @Singleton public class TabCompleteCache implements SubSystem { + private final Processing processing; private final PlanFiles files; private final DBSystem dbSystem; @@ -49,9 +51,11 @@ public class TabCompleteCache implements SubSystem { @Inject public TabCompleteCache( + Processing processing, PlanFiles files, DBSystem dbSystem ) { + this.processing = processing; this.files = files; this.dbSystem = dbSystem; playerIdentifiers = new ArrayList<>(); @@ -62,15 +66,17 @@ public class TabCompleteCache implements SubSystem { @Override public void enable() { - refreshPlayerIdentifiers(); - refreshServerIdentifiers(); - refreshUserIdentifiers(); - refreshBackupFileNames(); + processing.submitNonCritical(() -> { + refreshPlayerIdentifiers(); + refreshServerIdentifiers(); + refreshUserIdentifiers(); + refreshBackupFileNames(); - Collections.sort(playerIdentifiers); - Collections.sort(serverIdentifiers); - Collections.sort(userIdentifiers); - Collections.sort(backupFileNames); + Collections.sort(playerIdentifiers); + Collections.sort(serverIdentifiers); + Collections.sort(userIdentifiers); + Collections.sort(backupFileNames); + }); } private void refreshServerIdentifiers() { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/identification/ServerServerInfo.java b/Plan/common/src/main/java/com/djrapitops/plan/identification/ServerServerInfo.java index ee292620f..05f9604bd 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/identification/ServerServerInfo.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/identification/ServerServerInfo.java @@ -84,6 +84,7 @@ public class ServerServerInfo extends ServerInfo { logger.info(locale.getString(PluginLang.LOADING_SERVER_INFO)); Optional loaded = fromFile.load(null); server = loaded.orElseGet(this::registerNew); + logger.info(locale.getString(PluginLang.LOADED_SERVER_INFO, server.getUuid().toString())); processing.submitNonCritical(this::updateStorage); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/PluginLang.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/PluginLang.java index 986c1672f..e8840b085 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/PluginLang.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/PluginLang.java @@ -85,6 +85,7 @@ public enum PluginLang implements Lang { DB_NOTIFY_SQLITE_WAL("plugin.generic.dbNotifySQLiteWAL", "Database Notify - SQLite No WAL", "SQLite WAL mode not supported on this server version, using default. This may or may not affect performance."), DB_MYSQL_LAUNCH_OPTIONS_FAIL("plugin.generic.dbFaultyLaunchOptions", "Database MySQL - Launch Options Error", "Launch Options were faulty, using default (${0})"), LOADING_SERVER_INFO("plugin.generic.loadingServerInfo", "ServerInfo - Loading", "Loading server identifying information"), + LOADED_SERVER_INFO("plugin.generic.loadedServerInfo", "ServerInfo - Loaded", "Server identifier loaded: ${0}"), DB_SCHEMA_PATCH("plugin.generic.dbSchemaPatch", "Database Notify - Patch", "Database: Making sure schema is up to date.."), ; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/SQLDB.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/SQLDB.java index 254e8f20e..a8909673b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/SQLDB.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/SQLDB.java @@ -243,8 +243,13 @@ public abstract class SQLDB extends AbstractDatabase { * Updates to latest schema. */ private void setupDatabase() { + executeTransaction(new OperationCriticalTransaction() { + @Override + protected void performOperations() { + logger.info(locale.getString(PluginLang.DB_SCHEMA_PATCH)); + } + }); executeTransaction(new CreateTablesTransaction()); - logger.info(locale.getString(PluginLang.DB_SCHEMA_PATCH)); for (Patch patch : patches()) { executeTransaction(patch); }