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
06b4007c
Commit
06b4007c
authored
Jul 30, 2018
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid installing unwanted ConsoleHandler when cleaning up
Closes gh-13470
parent
01abb196
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
11 deletions
+4
-11
Slf4JLoggingSystem.java
.../org/springframework/boot/logging/Slf4JLoggingSystem.java
+4
-11
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/Slf4JLoggingSystem.java
View file @
06b4007c
...
@@ -50,7 +50,6 @@ public abstract class Slf4JLoggingSystem extends AbstractLoggingSystem {
...
@@ -50,7 +50,6 @@ public abstract class Slf4JLoggingSystem extends AbstractLoggingSystem {
public
void
cleanUp
()
{
public
void
cleanUp
()
{
if
(
isBridgeHandlerAvailable
())
{
if
(
isBridgeHandlerAvailable
())
{
removeJdkLoggingBridgeHandler
();
removeJdkLoggingBridgeHandler
();
reinstateConsoleHandlerIfNecessary
();
}
}
}
}
...
@@ -81,17 +80,18 @@ public abstract class Slf4JLoggingSystem extends AbstractLoggingSystem {
...
@@ -81,17 +80,18 @@ public abstract class Slf4JLoggingSystem extends AbstractLoggingSystem {
* @since 2.0.4
* @since 2.0.4
*/
*/
protected
final
boolean
isBridgeJulIntoSlf4j
()
{
protected
final
boolean
isBridgeJulIntoSlf4j
()
{
return
isBridgeHandlerAvailable
()
&&
isJulUsing
ItsDefaultConfiguration
();
return
isBridgeHandlerAvailable
()
&&
isJulUsing
ASingleConsoleHandlerAtMost
();
}
}
protected
final
boolean
isBridgeHandlerAvailable
()
{
protected
final
boolean
isBridgeHandlerAvailable
()
{
return
ClassUtils
.
isPresent
(
BRIDGE_HANDLER
,
getClassLoader
());
return
ClassUtils
.
isPresent
(
BRIDGE_HANDLER
,
getClassLoader
());
}
}
private
boolean
isJulUsing
ItsDefaultConfiguration
()
{
private
boolean
isJulUsing
ASingleConsoleHandlerAtMost
()
{
Logger
rootLogger
=
LogManager
.
getLogManager
().
getLogger
(
""
);
Logger
rootLogger
=
LogManager
.
getLogManager
().
getLogger
(
""
);
Handler
[]
handlers
=
rootLogger
.
getHandlers
();
Handler
[]
handlers
=
rootLogger
.
getHandlers
();
return
handlers
.
length
==
1
&&
handlers
[
0
]
instanceof
ConsoleHandler
;
return
handlers
.
length
==
0
||
(
handlers
.
length
==
1
&&
handlers
[
0
]
instanceof
ConsoleHandler
);
}
}
private
void
removeJdkLoggingBridgeHandler
()
{
private
void
removeJdkLoggingBridgeHandler
()
{
...
@@ -117,11 +117,4 @@ public abstract class Slf4JLoggingSystem extends AbstractLoggingSystem {
...
@@ -117,11 +117,4 @@ public abstract class Slf4JLoggingSystem extends AbstractLoggingSystem {
}
}
}
}
private
void
reinstateConsoleHandlerIfNecessary
()
{
Logger
rootLogger
=
LogManager
.
getLogManager
().
getLogger
(
""
);
if
(
rootLogger
.
getHandlers
().
length
==
0
)
{
rootLogger
.
addHandler
(
new
ConsoleHandler
());
}
}
}
}
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