[incubator-doris] branch master updated: [s3][bug] Remove log4j1 (#6211)

[yangzhg]

This is an automated email from the ASF dual-hosted git repository.

yangzhg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 39945ab  [s3][bug] Remove log4j1 (#6211)
39945ab is described below

commit 39945aba1e1c76a1bc7a63490eea7f4ef95ed3c2
Author: Mingyu Chen <morningman....@gmail.com>
AuthorDate: Thu Jul 15 10:47:59 2021 +0800

    [s3][bug] Remove log4j1 (#6211)
    
    There are jar package conflict
    
    Co-authored-by: chenmingyu <chenmin...@baidu.com>
---
 .../src/main/java/org/apache/doris/analysis/StorageBackend.java      | 5 +++--
 fe/fe-core/src/main/java/org/apache/doris/analysis/StorageDesc.java  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java
index e73a90e..933153b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java
@@ -27,12 +27,13 @@ import org.apache.doris.thrift.TStorageBackendType;
 import com.google.common.base.Strings;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 
 public class StorageBackend extends StorageDesc implements ParseNode {
-    private static Logger LOG = Logger.getLogger(StorageBackend.class);
+    private static final Logger LOG = 
LoggerFactory.getLogger(StorageBackend.class);
 
     private String location;
     private StorageType storageType;
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageDesc.java 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageDesc.java
index 83e5110..914e085 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageDesc.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageDesc.java
@@ -23,14 +23,15 @@ import org.apache.doris.common.Config;
 import org.apache.commons.collections.map.CaseInsensitiveMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.utils.URIBuilder;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Map;
 
 public abstract class StorageDesc {
-    private static Logger LOG = Logger.getLogger(StorageBackend.class);
+    private static final Logger LOG = 
LoggerFactory.getLogger(StorageBackend.class);
     // for dfs
     public static final String HADOOP_JOB_UGI = "hadoop.job.ugi";
     public static final String HADOOP_JOB_GROUP_NAME = "hadoop.job.group.name";

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org