File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed
embedded/src/org/labkey/embedded Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -159,8 +159,9 @@ csp.report=\
159159
160160# # Use a custom logging configuration
161161# logging.config=path/to/alternative/log4j2.xml
162- # logging.config=classpath:01.log4j2.xml
163- # logging.log4j2.config.override=${LABKEY_HOME}/01.log4j2.xml
162+
163+ # # Alternative method to override Log4J2 with a composite configuration, later in the list overrides any shared nodes
164+ # logging.log4j2.config.override=classpath:config/00.log4j2.xml,classpath:config/01.log4j2.xml
164165
165166# # File-based Tomcat HTTP access logs are enabled by default and use our recommended pattern. Override as needed.
166167# server.tomcat.accesslog.enabled=false
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change 33import org .apache .logging .log4j .LogManager ;
44import org .apache .logging .log4j .Logger ;
55import org .labkey .bootstrap .LabKeyBootstrapClassLoader ;
6- import org .springframework .core .io .Resource ;
7- import org .springframework .core .io .support .PathMatchingResourcePatternResolver ;
86
97import java .io .IOException ;
108import java .io .InputStream ;
You can’t perform that action at this time.
0 commit comments