Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
d12b6b3a
Commit
d12b6b3a
authored
Jun 25, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable LogbackLoggingSystem's XML support when spring.xml.ignore=true
Closes gh-22106
parent
2dd4a9cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
LogbackLoggingSystem.java
...gframework/boot/logging/logback/LogbackLoggingSystem.java
+5
-1
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
View file @
d12b6b3a
...
...
@@ -49,6 +49,7 @@ import org.springframework.boot.logging.LoggingInitializationContext;
import
org.springframework.boot.logging.LoggingSystem
;
import
org.springframework.boot.logging.LoggingSystemProperties
;
import
org.springframework.boot.logging.Slf4JLoggingSystem
;
import
org.springframework.core.SpringProperties
;
import
org.springframework.core.env.Environment
;
import
org.springframework.util.Assert
;
import
org.springframework.util.ResourceUtils
;
...
...
@@ -65,6 +66,9 @@ import org.springframework.util.StringUtils;
*/
public
class
LogbackLoggingSystem
extends
Slf4JLoggingSystem
{
// Static final field to facilitate code removal by Graal
private
static
final
boolean
XML_ENABLED
=
!
SpringProperties
.
getFlag
(
"spring.xml.ignore"
);
private
static
final
String
CONFIGURATION_FILE_PROPERTY
=
"logback.configurationFile"
;
private
static
final
LogLevels
<
Level
>
LEVELS
=
new
LogLevels
<>();
...
...
@@ -172,7 +176,7 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem {
private
void
configureByResourceUrl
(
LoggingInitializationContext
initializationContext
,
LoggerContext
loggerContext
,
URL
url
)
throws
JoranException
{
if
(
url
.
toString
().
endsWith
(
"xml"
))
{
if
(
XML_ENABLED
&&
url
.
toString
().
endsWith
(
"xml"
))
{
JoranConfigurator
configurator
=
new
SpringBootJoranConfigurator
(
initializationContext
);
configurator
.
setContext
(
loggerContext
);
configurator
.
doConfigure
(
url
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment