This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 8af7f6c678aed942b408ecf14a79186e990122f1 Author: Juan Cabrerizo <[email protected]> AuthorDate: Thu Sep 30 11:57:17 2021 +0100 Improve log test and add explicid default LogStore value --- .../org/apache/brooklyn/util/core/logbook/DelegatingLogStore.java | 4 ++-- .../java/org/apache/brooklyn/util/core/logbook/LogbookConfig.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/apache/brooklyn/util/core/logbook/DelegatingLogStore.java b/core/src/main/java/org/apache/brooklyn/util/core/logbook/DelegatingLogStore.java index dc21341..c5d8909 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/logbook/DelegatingLogStore.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/logbook/DelegatingLogStore.java @@ -61,13 +61,13 @@ public class DelegatingLogStore implements LogStore { String className = brooklynProperties.getConfig(LogbookConfig.LOGBOOK_LOG_STORE_CLASSNAME); try { // TODO implement logic to allow to inject the implementation from other bundle. - log.info("Brooklyn Logbook: using log store " + className); ClassLoaderUtils clu = new ClassLoaderUtils(this, mgmt); Class<? extends LogStore> clazz = (Class<? extends LogStore>) clu.loadClass(className); delegate = createLogStoreProviderInstance(mgmt, clazz); + log.info("Brooklyn Logbook: using log store " + className); } catch (Exception e) { log.warn("Brooklyn Logbook: unable to instantiate Log Store '" + className + "'. Fall back on FileLogStore", e.getMessage()); - log.debug("", e); + log.debug("Exception thrown trying to instantiate {} as LogStore:", className, e); delegate = new FileLogStore(mgmt); } diff --git a/core/src/main/java/org/apache/brooklyn/util/core/logbook/LogbookConfig.java b/core/src/main/java/org/apache/brooklyn/util/core/logbook/LogbookConfig.java index d93dfd3..5c8ea14 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/logbook/LogbookConfig.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/logbook/LogbookConfig.java @@ -25,7 +25,7 @@ public class LogbookConfig { public final static String BASE_NAME_LOGBOOK = "brooklyn.logbook"; public final static ConfigKey<String> LOGBOOK_LOG_STORE_CLASSNAME = ConfigKeys.newStringConfigKey( - BASE_NAME_LOGBOOK + ".logStore", "Log store implementation class name"); + BASE_NAME_LOGBOOK + ".logStore", "Log store implementation class name","org.apache.brooklyn.util.core.logbook.file.FileLogStore"); public final static ConfigKey<LogStore> LOGBOOK_LOG_STORE_INSTANCE = ConfigKeys.newConfigKey(LogStore.class, LOGBOOK_LOG_STORE_CLASSNAME.getName() + ".internal.instance", "instance of a pre-configured log store");
