broker/ResourceLoaderConfig: code formatter used
This commit is contained in:
@@ -13,11 +13,11 @@
|
|||||||
*
|
*
|
||||||
* You may elect to redistribute this code under either of these licenses.
|
* You may elect to redistribute this code under either of these licenses.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.moquette.server.config;
|
package io.moquette.server.config;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
@@ -39,38 +39,45 @@ public class ResourceLoaderConfig extends IConfig {
|
|||||||
public ResourceLoaderConfig(IResourceLoader resourceLoader, String configName) {
|
public ResourceLoaderConfig(IResourceLoader resourceLoader, String configName) {
|
||||||
LOG.info("Loading configuration. ResourceLoader = {}, configName = {}.", resourceLoader.getName(), configName);
|
LOG.info("Loading configuration. ResourceLoader = {}, configName = {}.", resourceLoader.getName(), configName);
|
||||||
this.resourceLoader = resourceLoader;
|
this.resourceLoader = resourceLoader;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If we use a conditional operator, the loadResource() and the
|
* If we use a conditional operator, the loadResource() and the loadDefaultResource()
|
||||||
* loadDefaultResource() methods will be always called. This makes the
|
* methods will be always called. This makes the log traces confusing.
|
||||||
* log traces confusing.
|
*/
|
||||||
*/
|
|
||||||
|
|
||||||
Reader configReader;
|
Reader configReader;
|
||||||
if (configName != null) {
|
if (configName != null) {
|
||||||
configReader = resourceLoader.loadResource(configName);
|
configReader = resourceLoader.loadResource(configName);
|
||||||
} else {
|
} else {
|
||||||
configReader = resourceLoader.loadDefaultResource();
|
configReader = resourceLoader.loadDefaultResource();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (configReader == null) {
|
if (configReader == null) {
|
||||||
LOG.error("The resource loader returned no configuration reader. ResourceLoader = {}, configName = {}.",
|
LOG.error(
|
||||||
resourceLoader.getName(), configName);
|
"The resource loader returned no configuration reader. ResourceLoader = {}, configName = {}.",
|
||||||
throw new IllegalArgumentException("Can't locate " + resourceLoader.getName() + " \"" + configName + "\"");
|
resourceLoader.getName(),
|
||||||
|
configName);
|
||||||
|
throw new IllegalArgumentException("Can't locate " + resourceLoader.getName() + " \"" + configName + "\"");
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG.info("Parsing configuration properties. ResourceLoader = {}, configName = {}.", resourceLoader.getName(),
|
LOG.info(
|
||||||
configName);
|
"Parsing configuration properties. ResourceLoader = {}, configName = {}.",
|
||||||
|
resourceLoader.getName(),
|
||||||
|
configName);
|
||||||
ConfigurationParser confParser = new ConfigurationParser();
|
ConfigurationParser confParser = new ConfigurationParser();
|
||||||
m_properties = confParser.getProperties();
|
m_properties = confParser.getProperties();
|
||||||
assignDefaults();
|
assignDefaults();
|
||||||
try {
|
try {
|
||||||
confParser.parse(configReader);
|
confParser.parse(configReader);
|
||||||
} catch (ParseException pex) {
|
} catch (ParseException pex) {
|
||||||
LOG.warn(
|
LOG.warn(
|
||||||
"Unable to parse configuration properties. Using default configuration. ResourceLoader = {}, configName = {}, cause = {}, errorMessage = {}.",
|
"Unable to parse configuration properties. Using default configuration. "
|
||||||
resourceLoader.getName(), configName, pex.getCause(), pex.getMessage());
|
+ "ResourceLoader = {}, configName = {}, cause = {}, errorMessage = {}.",
|
||||||
}
|
resourceLoader.getName(),
|
||||||
|
configName,
|
||||||
|
pex.getCause(),
|
||||||
|
pex.getMessage());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user