Skip to content

Commit 482b9b2

Browse files
committed
Clean up and add comments
1 parent 90ba788 commit 482b9b2

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

server/configs/application.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,9 @@ csp.report=\
157157

158158
## Use a custom logging configuration
159159
#logging.config=path/to/alternative/log4j2.xml
160-
#logging.config=classpath:01.log4j2.xml
161-
#logging.log4j2.config.override=${LABKEY_HOME}/01.log4j2.xml
160+
161+
## Alternative method to override Log4J2 with a composite configuration, later in the list overrides any shared nodes
162+
#logging.log4j2.config.override=classpath:config/00.log4j2.xml,classpath:config/01.log4j2.xml
162163

163164
## File-based Tomcat HTTP access logs are enabled by default and use our recommended pattern. Override as needed.
164165
#server.tomcat.accesslog.enabled=false

server/configs/webapps/embedded/config/application.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ mail.smtpUser=Anonymous
9292

9393
## Use a custom logging configuration
9494
#logging.config=labkeywebapp/WEB-INF/classes/log4j2.xml
95-
#logging.config=classpath:01.log4j2.xml
96-
#logging.log4j2.config.override=${LABKEY_HOME}/01.log4j2.xml
95+
96+
## Alternative method to override Log4J2 with a composite configuration, later in the list overrides any shared nodes
97+
#logging.log4j2.config.override=classpath:config/00.log4j2.xml,classpath:config/01.log4j2.xml
9798

9899
## Enable tomcat access log
99100
#server.tomcat.accesslog.enabled=true

server/embedded/src/org/labkey/embedded/LabKeySpringBootClassLoader.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import org.apache.logging.log4j.LogManager;
44
import org.apache.logging.log4j.Logger;
55
import org.labkey.bootstrap.LabKeyBootstrapClassLoader;
6-
import org.springframework.core.io.Resource;
7-
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
86

97
import java.io.IOException;
108
import java.io.InputStream;

0 commit comments

Comments
 (0)