Skip to content

Moqui now honors the standard Log4j property 'log4j.configurationFile' #706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmochel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Moqui now honors the standard Log4j property 'log4j.configurationFile' #706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion framework/src/main/groovy/org/moqui/impl/context/ExecutionContextFactoryImpl.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,15 +306,25 @@ class ExecutionContextFactoryImpl implements ExecutionContextFactory {
}

protected void reconfigureLog4j() {
URL log4j2Url = this.class.getClassLoader().getResource("log4j2.xml")

String log4jStr = SystemBinding.getPropOrEnv("log4j.configurationFile")?.trim()

URL log4j2Url = log4jStr ?
new File(log4jStr).toURI().toURL() :
this.class.getClassLoader().getResource("log4j2.xml")

if (log4j2Url == null) {
logger.warn("No log4j2.xml file found on the classpath, no reconfiguring Log4J")
return
}

logger.info("Reconfiguring Log4J with ${log4j2Url}")

final LoggerContext ctx = (LoggerContext) LogManager.getContext(true)
ctx.setConfigLocation(log4j2Url.toURI())
}


protected MNode initBaseConfig(MNode runtimeConfXmlRoot) {
String version = this.class.getPackage().getImplementationVersion()
if (version != null) moquiVersion = version
Expand Down