Improved config load
This commit is contained in:
parent
4545638025
commit
c3d33b257b
@ -41,7 +41,7 @@ public class AuthMeVelocityPlugin {
|
|||||||
|
|
||||||
@Subscribe
|
@Subscribe
|
||||||
public void onProxyInitialization(ProxyInitializeEvent event) {
|
public void onProxyInitialization(ProxyInitializeEvent event) {
|
||||||
Toml toml = this.loadConfig(pluginDirectory, logger);
|
Toml toml = this.loadConfig(pluginDirectory);
|
||||||
if(toml == null){
|
if(toml == null){
|
||||||
logger.warn("Failed to load config.toml. Shutting down.");
|
logger.warn("Failed to load config.toml. Shutting down.");
|
||||||
return;
|
return;
|
||||||
@ -71,12 +71,12 @@ public class AuthMeVelocityPlugin {
|
|||||||
return this.api;
|
return this.api;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Toml loadConfig(Path path, Logger logger){
|
private Toml loadConfig(Path path){
|
||||||
if(!Files.exists(path)){
|
if(!Files.exists(path)){
|
||||||
try {
|
try {
|
||||||
Files.createDirectory(path);
|
Files.createDirectory(path);
|
||||||
} catch(IOException e){
|
} catch(IOException e){
|
||||||
logger.info("An error ocurred on configuration initialization: {}", e.getMessage());
|
configError(e);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -85,10 +85,19 @@ public class AuthMeVelocityPlugin {
|
|||||||
try(InputStream in = this.getClass().getClassLoader().getResourceAsStream("config.toml")){
|
try(InputStream in = this.getClass().getClassLoader().getResourceAsStream("config.toml")){
|
||||||
Files.copy(in, configPath);
|
Files.copy(in, configPath);
|
||||||
} catch(IOException e){
|
} catch(IOException e){
|
||||||
logger.info("An error ocurred on configuration initialization: {}", e.getMessage());
|
configError(e);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return new Toml().read(configPath.toFile());
|
try {
|
||||||
|
return new Toml().read(Files.newInputStream(configPath));
|
||||||
|
} catch(IOException e){
|
||||||
|
configError(e);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void configError(Exception ex){
|
||||||
|
logger.info("An error ocurred on configuration initialization: {}", ex.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user