[#777] Added ServerSettingsManager

- This manager updates config if database has changes, and updates the
  config in database if the file is modified.
- equals and hashcode to ConfigNode
This commit is contained in:
Rsl1122 2018-12-24 11:25:17 +02:00
parent 0acf54eed5
commit 4791657439
3 changed files with 156 additions and 2 deletions

View File

@ -323,4 +323,22 @@ public class ConfigNode {
protected List<String> getNodeOrder() {
return nodeOrder;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ConfigNode that = (ConfigNode) o;
return Objects.equals(key, that.key) &&
Objects.equals(parent, that.parent) &&
nodeOrder.equals(that.nodeOrder) &&
childNodes.equals(that.childNodes) &&
comment.equals(that.comment) &&
Objects.equals(value, that.value);
}
@Override
public int hashCode() {
return Objects.hash(key, parent, nodeOrder, childNodes, comment, value);
}
}

View File

@ -1,6 +1,7 @@
package com.djrapitops.plan.system.settings.network;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.system.SubSystem;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.system.file.PlanFiles;
@ -29,7 +30,7 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
/**
* In charge of all configs on the network.
* In charge of updating network-server configs.
* <p>
* Performs the following tasks related to network configs:
* - File modification watching related to server configs
@ -39,7 +40,7 @@ import java.util.concurrent.TimeUnit;
* @author Rsl1122
*/
@Singleton
public class NetworkSettingManager {
public class NetworkSettingManager implements SubSystem {
private final PlanFiles files;
private final DBSystem dbSystem;
@ -70,6 +71,7 @@ public class NetworkSettingManager {
this.errorHandler = errorHandler;
}
@Override
public void enable() throws EnableException {
serverSettingsFolder = createServerSettingsFolder();
@ -79,6 +81,7 @@ public class NetworkSettingManager {
scheduleDBCheckTask();
}
@Override
public void disable() {
if (watcher != null) {
watcher.interrupt();

View File

@ -0,0 +1,133 @@
package com.djrapitops.plan.system.settings.network;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.system.SubSystem;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.system.file.PlanFiles;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.settings.config.Config;
import com.djrapitops.plan.system.settings.config.ConfigReader;
import com.djrapitops.plan.system.settings.config.ConfigWriter;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.TimeSettings;
import com.djrapitops.plan.system.tasks.TaskSystem;
import com.djrapitops.plan.utilities.file.FileWatcher;
import com.djrapitops.plan.utilities.file.WatchedFile;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import com.djrapitops.plugin.task.AbsRunnable;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.io.File;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
/**
* In charge of updating server-network config.
* <p>
* Performs following tasks related to the config:
* - File modification watching related to config.yml
* - Database updating related to config.yml
* - File update operations from database related to config.yml
*
* @author Rsl1122
*/
@Singleton
public class ServerSettingsManager implements SubSystem {
private final PlanFiles files;
private final PlanConfig config;
private final DBSystem dbSystem;
private final TaskSystem taskSystem;
private final ErrorHandler errorHandler;
private final UUID serverUUID;
private PluginLogger logger;
private FileWatcher watcher;
@Inject
public ServerSettingsManager(
PlanFiles files,
PlanConfig config,
DBSystem dbSystem,
ServerInfo serverInfo,
TaskSystem taskSystem,
PluginLogger logger,
ErrorHandler errorHandler
) {
this.files = files;
this.config = config;
this.dbSystem = dbSystem;
this.taskSystem = taskSystem;
this.logger = logger;
this.errorHandler = errorHandler;
serverUUID = serverInfo.getServerUUID();
}
@Override
public void enable() throws EnableException {
watcher = prepareFileWatcher();
scheduleDBCheckTask();
}
private FileWatcher prepareFileWatcher() {
FileWatcher fileWatcher = new FileWatcher(files.getDataFolder(), errorHandler);
File configFile = files.getConfigFile();
fileWatcher.addToWatchlist(new WatchedFile(configFile,
() -> updateConfigInDB(configFile)
));
return fileWatcher;
}
private void updateConfigInDB(File file) {
if (!file.exists()) {
return;
}
Database database = dbSystem.getDatabase();
try {
Config config = new ConfigReader(file.toPath()).read();
database.save().saveConfig(serverUUID, config);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}
private void scheduleDBCheckTask() {
long checkPeriod = TimeAmount.toTicks(config.get(TimeSettings.CONFIG_UPDATE_INTERVAL), TimeUnit.MINUTES);
taskSystem.registerTask("Config Update DB Checker", new AbsRunnable() {
@Override
public void run() {
checkDBForNewConfigSettings(dbSystem.getDatabase());
}
}).runTaskTimerAsynchronously(checkPeriod, checkPeriod);
}
private void checkDBForNewConfigSettings(Database database) {
File configFile = files.getConfigFile();
long lastModified = configFile.exists() ? configFile.lastModified() : -1;
Optional<Config> foundConfig = database.fetch().getNewConfig(lastModified, serverUUID);
if (foundConfig.isPresent()) {
try {
new ConfigWriter(configFile.toPath()).write(foundConfig.get());
logger.info("The Config was updated to match one on the Proxy. Reload for changes to take effect.");
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}
}
@Override
public void disable() {
if (watcher != null) {
watcher.interrupt();
}
}
}