-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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.
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
[ISSUE-#4567] Refactor nacos-client Load Logging Configuration code. #4572
Merged
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
57965d8
for #4567, refactor nacos-client logging load Configuration code.
Maijh97 2d49c20
Modify exception handling.
Maijh97 a95f024
When customizing AbstractNacosLogging Load Configuration Fail, use th…
Maijh97 17069ce
NacosLogging has been modified to a single-column mode.
Maijh97 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
88 changes: 88 additions & 0 deletions
88
client/src/main/java/com/alibaba/nacos/client/logging/NacosLoggingUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
/* | ||
* Copyright 1999-2018 Alibaba Group Holding Ltd. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package com.alibaba.nacos.client.logging; | ||
|
||
import com.alibaba.nacos.client.logging.log4j2.Log4J2NacosLogging; | ||
import com.alibaba.nacos.client.logging.logback.LogbackNacosLogging; | ||
import org.slf4j.LoggerFactory; | ||
import org.slf4j.Logger; | ||
|
||
/** | ||
* nacos logging. | ||
* | ||
* @author mai.jh | ||
*/ | ||
public final class NacosLoggingUtils { | ||
|
||
private static final Logger LOGGER = LoggerFactory.getLogger(NacosLoggingUtils.class); | ||
|
||
/** | ||
* Load logging Configuration. | ||
*/ | ||
public static void loadConfiguration() { | ||
loadConfiguration(null); | ||
} | ||
|
||
/** | ||
* Load the log configuration file according to the specified {@link AbstractNacosLogging} implementation, If {@code | ||
* logging} is null, use the default policy. | ||
* | ||
* @param logging {@link AbstractNacosLogging} | ||
*/ | ||
public static void loadConfiguration(AbstractNacosLogging logging) { | ||
try { | ||
if (logging != null) { | ||
try { | ||
logging.loadConfiguration(); | ||
} catch (Exception e) { | ||
LOGGER.warn("Customize the {} load Configuration fail, message: {}", logging.getClass().getName(), e.getMessage()); | ||
loadDefaultConfiguration(); | ||
} | ||
} else { | ||
loadDefaultConfiguration(); | ||
} | ||
} catch (Throwable ex) { | ||
LOGGER.warn("Init Nacos Logging fail, message: {}", ex.getMessage()); | ||
} | ||
} | ||
|
||
/** | ||
* Load default Configuration. | ||
*/ | ||
private static void loadDefaultConfiguration() { | ||
boolean isLogback = false; | ||
AbstractNacosLogging nacosLogging; | ||
try { | ||
Class.forName("ch.qos.logback.classic.Logger"); | ||
nacosLogging = new LogbackNacosLogging(); | ||
isLogback = true; | ||
} catch (ClassNotFoundException e) { | ||
nacosLogging = new Log4J2NacosLogging(); | ||
} | ||
|
||
try { | ||
nacosLogging.loadConfiguration(); | ||
} catch (Throwable t) { | ||
if (isLogback) { | ||
LOGGER.warn("Load Logback Configuration of Nacos fail, message: {}", t.getMessage()); | ||
} else { | ||
LOGGER.warn("Load Log4j Configuration of Nacos fail, message: {}", t.getMessage()); | ||
} | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.