Skip to content
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 4 commits into from
Dec 26, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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());
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LOGGER.warn("Customize the {} load configuration fail, use default log configuration. 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());
}
}
}

}
32 changes: 2 additions & 30 deletions client/src/main/java/com/alibaba/nacos/client/utils/LogUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

package com.alibaba.nacos.client.utils;

import com.alibaba.nacos.client.logging.AbstractNacosLogging;
import com.alibaba.nacos.client.logging.log4j2.Log4J2NacosLogging;
import com.alibaba.nacos.client.logging.logback.LogbackNacosLogging;
import com.alibaba.nacos.client.logging.NacosLoggingUtils;
import org.slf4j.Logger;

import static org.slf4j.LoggerFactory.getLogger;
Expand All @@ -34,33 +32,7 @@ public class LogUtils {
public static final Logger NAMING_LOGGER;

static {
try {
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) {
getLogger(LogUtils.class)
.warn("Load Logback Configuration of Nacos fail, message: {}", t.getMessage());
} else {
getLogger(LogUtils.class)
.warn("Load Log4j Configuration of Nacos fail, message: {}", t.getMessage());
}
}
} catch (Throwable ex) {
getLogger(LogUtils.class).warn("Init Nacos Logging fail, message: {}", ex.getMessage());
}

NacosLoggingUtils.loadConfiguration();
NAMING_LOGGER = getLogger("com.alibaba.nacos.client.naming");
}

Expand Down