Improve logging of package io.moquette.server.config

This commit is contained in:
Luis Barrios
2017-01-11 14:56:16 +01:00
parent 7666a1634a
commit 1592a0676c
3 changed files with 42 additions and 9 deletions
@@ -38,19 +38,38 @@ public class ResourceLoaderConfig extends IConfig {
public ResourceLoaderConfig(IResourceLoader resourceLoader, String configName) {
this.resourceLoader = resourceLoader;
Reader configReader = configName != null ? resourceLoader.loadResource(configName) : resourceLoader.loadDefaultResource();
if (configReader == null) {
throw new IllegalArgumentException(
"Can't locate " + resourceLoader.getName() + " \"" + configName + "\"");
/*
* If we use a conditional operator, the loadResource() and the
* loadDefaultResource() methods will be always called. This makes the
* log traces confusing.
*/
Reader configReader;
if (configName != null) {
configReader = resourceLoader.loadResource(configName);
} else {
configReader = resourceLoader.loadDefaultResource();
}
if (configReader == null) {
LOG.error("The resource loader returned no configuration reader. ResourceLoader = {}, configName = {}.",
resourceLoader.getName(), configName);
throw new IllegalArgumentException("Can't locate " + resourceLoader.getName() + " \"" + configName + "\"");
}
LOG.info("Parsing configuration properties. ResourceLoader = {}, configName = {}.", resourceLoader.getName(),
configName);
ConfigurationParser confParser = new ConfigurationParser();
m_properties = confParser.getProperties();
assignDefaults();
try {
confParser.parse(configReader);
} catch (ParseException pex) {
LOG.warn("An error occurred in parsing configuration, fallback on default configuration", pex);
}
try {
confParser.parse(configReader);
} catch (ParseException pex) {
LOG.warn(
"Unable to parse configuration properties. Using default configuration. ResourceLoader = {}, configName = {}, cause = {}, errorMessage = {}.",
resourceLoader.getName(), configName, pex.getCause(), pex.getMessage());
}
}
@Override