mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-27 09:00:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed PatchTask

Browse Source
This commit is contained in:
Rsl1122 2019-02-16 14:58:54 +02:00
parent 33eec6d990
commit 360e631fc9
2 changed files with 3 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java
View File

@ -27,7 +27,6 @@ import com.djrapitops.plan.db.access.transactions.init.CleanTransaction;
import com.djrapitops.plan.db.access.transactions.init.CreateIndexTransaction; import com.djrapitops.plan.db.access.transactions.init.CreateIndexTransaction;
import com.djrapitops.plan.db.access.transactions.init.CreateTablesTransaction; import com.djrapitops.plan.db.access.transactions.init.CreateTablesTransaction;
import com.djrapitops.plan.db.patches.*; import com.djrapitops.plan.db.patches.*;
import com.djrapitops.plan.db.tasks.PatchTask;
import com.djrapitops.plan.system.locale.Locale; import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plan.system.settings.config.PlanConfig; import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.PluginSettings; import com.djrapitops.plan.system.settings.paths.PluginSettings;
@ -167,23 +166,15 @@ public abstract class SQLDB extends AbstractDatabase {
private void setupDatabase() throws DBInitException { private void setupDatabase() throws DBInitException {
try { try {
executeTransaction(new CreateTablesTransaction()); executeTransaction(new CreateTablesTransaction());
for (Patch patch : patches()) {
executeTransaction(patch);
}
registerIndexCreationTask(); registerIndexCreationTask();
registerPatchTask();
} catch (DBOpException | IllegalArgumentException e) { } catch (DBOpException | IllegalArgumentException e) {
throw new DBInitException("Failed to set-up Database", e); throw new DBInitException("Failed to set-up Database", e);
} }
} }
private void registerPatchTask() {
Patch[] patches = patches();
try {
runnableFactory.create("Database Patch", new PatchTask(patches, locale, logger, errorHandler))
.runTaskLaterAsynchronously(TimeAmount.toTicks(5L, TimeUnit.SECONDS));
} catch (Exception ignore) {
// Task failed to register because plugin is being disabled
}
}
private void registerIndexCreationTask() { private void registerIndexCreationTask() {
try { try {
runnableFactory.create("Database Index Creation", new AbsRunnable() { runnableFactory.create("Database Index Creation", new AbsRunnable() {

76
Plan/common/src/main/java/com/djrapitops/plan/db/tasks/PatchTask.java
View File

@ -1,76 +0,0 @@
/*
* This file is part of Player Analytics (Plan).
*
* Plan is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License v3 as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Plan is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.db.tasks;
import com.djrapitops.plan.db.patches.Patch;
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 com.djrapitops.plugin.task.AbsRunnable;
/**
* Task that is in charge on patching the database when the database enables.
*
* @author Rsl1122
*/
@Deprecated
public class PatchTask extends AbsRunnable {
private final Patch[] patches;
private final Locale locale;
private final PluginLogger logger;
private final ErrorHandler errorHandler;
public PatchTask(Patch[] patches, Locale locale, PluginLogger logger, ErrorHandler errorHandler) {
this.patches = patches;
this.locale = locale;
this.logger = logger;
this.errorHandler = errorHandler;
}
@Override
public void run() {
try {
boolean applied = applyPatches();
logger.info(locale.getString(
applied ? PluginLang.DB_APPLIED_PATCHES : PluginLang.DB_APPLIED_PATCHES_ALREADY
));
} catch (Exception e) {
logger.error("----------------------------------------------------");
logger.error(locale.getString(PluginLang.ENABLE_FAIL_DB_PATCH));
logger.error("----------------------------------------------------");
errorHandler.log(L.CRITICAL, this.getClass(), e);
}
}
private boolean applyPatches() {
boolean didApply = false;
for (Patch patch : patches) {
if (!patch.hasBeenApplied()) {
String patchName = patch.getClass().getSimpleName();
logger.info(locale.getString(PluginLang.DB_APPLY_PATCH, patchName));
patch.apply();
didApply = true;
}
}
return didApply;
}
}