diff --git a/constants.properties b/constants.properties index efd2246e17..cc51fb72b9 100644 --- a/constants.properties +++ b/constants.properties @@ -5,7 +5,7 @@ cordaVersion=4.12 versionSuffix=SNAPSHOT -cordaShellVersion=4.12-HC01 +cordaShellVersion=4.12-SNAPSHOT gradlePluginsVersion=5.1.1 artifactoryContextUrl=https://software.r3.com/artifactory internalPublishVersion=1.+ diff --git a/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt b/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt index 2bfe9d023b..31d7a20fb5 100644 --- a/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt +++ b/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt @@ -47,6 +47,8 @@ import net.corda.node.utilities.registration.NodeRegistrationException import net.corda.nodeapi.internal.JVMAgentUtilities import net.corda.nodeapi.internal.addShutdownHook import net.corda.nodeapi.internal.persistence.DatabaseIncompatibleException +import org.apache.logging.log4j.LogManager +import org.apache.logging.log4j.core.LoggerContext import org.fusesource.jansi.Ansi import org.slf4j.bridge.SLF4JBridgeHandler import picocli.CommandLine.Mixin @@ -531,6 +533,7 @@ fun CliWrapperBase.initLogging(baseDirectory: Path): Boolean { System.setProperty("consoleLogLevel", specifiedLogLevel) Node.renderBasicInfoToConsole = false } + (LogManager.getContext(false) as LoggerContext).reconfigure() //Test for access to the logging path and shutdown if we are unable to reach it. val logPath = baseDirectory / NodeCliCommand.LOGS_DIRECTORY_NAME