No more null errors from corrupt config.yml's.

This commit is contained in:
ElgarL 2012-08-19 14:49:16 +01:00
parent 84f7859ca9
commit 979da6e713
2 changed files with 67 additions and 30 deletions

View file

@ -194,3 +194,4 @@ v 2.0:
- Stop using the YamlConfiguration in bukkit for our config handling. We can now support periods in world names. - Stop using the YamlConfiguration in bukkit for our config handling. We can now support periods in world names.
- Fix GlobalGroups not loading permission nodes. - Fix GlobalGroups not loading permission nodes.
- Fix an error with Logging set to 'OFF' triggering a cast exception. - Fix an error with Logging set to 'OFF' triggering a cast exception.
- No more null errors from corrupt config.yml's.

View file

@ -7,6 +7,7 @@ package org.anjocaido.groupmanager;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
@ -21,10 +22,10 @@ import org.yaml.snakeyaml.reader.UnicodeReader;
*/ */
public class GMConfiguration { public class GMConfiguration {
private boolean opOverride; private boolean opOverride = true;
private boolean toggleValidate; private boolean toggleValidate = true;
private Integer saveInterval; private Integer saveInterval = 10;
private Integer backupDuration; private Integer backupDuration = 24;
private String loggerLevel = "OFF"; private String loggerLevel = "OFF";
private Map<String, Object> mirrorsMap; private Map<String, Object> mirrorsMap;
@ -35,6 +36,16 @@ public class GMConfiguration {
public GMConfiguration(GroupManager plugin) { public GMConfiguration(GroupManager plugin) {
this.plugin = plugin; this.plugin = plugin;
/*
* Set defaults
*/
opOverride = true;
toggleValidate = true;
saveInterval = 10;
backupDuration = 24;
loggerLevel = "OFF";
load(); load();
} }
@ -51,7 +62,7 @@ public class GMConfiguration {
try { try {
Tasks.copy(plugin.getResourceAsStream("config.yml"), configFile); Tasks.copy(plugin.getResourceAsStream("config.yml"), configFile);
} catch (IOException ex) { } catch (IOException ex) {
GroupManager.logger.log(Level.SEVERE, null, ex); GroupManager.logger.log(Level.SEVERE, "Error creating a new config.yml", ex);
} }
} }
@ -69,6 +80,7 @@ public class GMConfiguration {
/* /*
* Read our config settings ands store them for reading later. * Read our config settings ands store them for reading later.
*/ */
try {
Map<String, Object> config = getElement("config", getElement("settings", GMconfig)); Map<String, Object> config = getElement("config", getElement("settings", GMconfig));
opOverride = (Boolean) config.get("opOverrides"); opOverride = (Boolean) config.get("opOverrides");
@ -77,10 +89,26 @@ public class GMConfiguration {
/* /*
* data node for save/backup timers. * data node for save/backup timers.
*/ */
try {
Map<String, Object> save = getElement("save", getElement("data", getElement("settings", GMconfig))); Map<String, Object> save = getElement("save", getElement("data", getElement("settings", GMconfig)));
try {
saveInterval = (Integer) save.get("minutes"); saveInterval = (Integer) save.get("minutes");
} catch (Exception ex) {
GroupManager.logger.log(Level.SEVERE, "Missing or corrupt 'minutes' node. Using default setting", ex);
}
try {
backupDuration = (Integer) save.get("hours"); backupDuration = (Integer) save.get("hours");
} catch (Exception ex) {
GroupManager.logger.log(Level.SEVERE, "Missing or corrupt 'hours' node. Using default setting", ex);
}
} catch (Exception ex) {
GroupManager.logger.log(Level.SEVERE, "Missing or corrupt 'data' node. Using default settings", ex);
}
Object level = ((Map<String, String>) getElement("settings", GMconfig).get("logging")).get("level"); Object level = ((Map<String, String>) getElement("settings", GMconfig).get("logging")).get("level");
if (level instanceof String) if (level instanceof String)
@ -91,6 +119,14 @@ public class GMConfiguration {
*/ */
mirrorsMap = (Map<String, Object>) ((Map<String, Object>) GMconfig.get("settings")).get("mirrors"); mirrorsMap = (Map<String, Object>) ((Map<String, Object>) GMconfig.get("settings")).get("mirrors");
} catch (Exception ex) {
/*
* Flag the error and use defaults
*/
GroupManager.logger.log(Level.SEVERE, "There are errors in your config.yml. Using default settings", ex);
mirrorsMap = new HashMap<String, Object>();
}
// Setup defaults // Setup defaults
adjustLoggerLevel(); adjustLoggerLevel();
plugin.setValidateOnlinePlayer(isToggleValidate()); plugin.setValidateOnlinePlayer(isToggleValidate());