summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgujinkai <[email protected]>2023-11-27 14:04:17 +0800
committergujinkai <[email protected]>2023-11-27 14:04:17 +0800
commitd996e4086edcd04f01f7b7f63d370a76449e6ba3 (patch)
tree1c8f12d9c4c251b34bab7da63712eebcb566acd8
parentc6ed1350b69bf3ea90fc37264827be280aa9da5e (diff)
refactor: refactor logger
-rw-r--r--module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/dns/process/FirstAggregation.java6
-rw-r--r--module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/operator/AbstractFirstAggregation.java6
-rw-r--r--module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/operator/FirstAggregation.java6
-rw-r--r--platform-base/src/main/java/com/zdjizhi/base/utils/FileByteUtils.java6
-rw-r--r--platform-base/src/main/java/com/zdjizhi/base/utils/FileUtils.java16
-rw-r--r--platform-base/src/main/java/com/zdjizhi/base/utils/HttpClientUtils.java7
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/knowledge/CustomKnowledge.java12
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/knowledge/KnowledgeManager.java14
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/knowledge/NacosManager.java7
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/rule/RuleUpdateListener.java6
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/AppUtils.java3
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/DnsServerUtils.java3
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/IdcRenterUtils.java3
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/IocDarkWebUtils.java15
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/IocMalwareUtils.java15
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/LinkUtils.java3
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/PsiphonUtils.java3
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/csv/HighCsvReader.java5
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/CategoryUtils.java3
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/IcpUtils.java2
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/WhoisUtils.java3
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/ip/InternalIpUtils.java3
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/tag/BaseTagUtils.java9
-rw-r--r--platform-etl/src/main/java/com/zdjizhi/etl/utils/tag/IpTagUtils.java5
-rw-r--r--platform-schedule/src/main/java/com/zdjizhi/schedule/Execute.java3
25 files changed, 92 insertions, 72 deletions
diff --git a/module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/dns/process/FirstAggregation.java b/module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/dns/process/FirstAggregation.java
index dee6061..f3f4245 100644
--- a/module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/dns/process/FirstAggregation.java
+++ b/module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/dns/process/FirstAggregation.java
@@ -19,7 +19,7 @@ import java.util.Map;
public class FirstAggregation extends AbstractFirstAggregation<DnsMetricLog> {
- private static Logger LOG = LoggerFactory.getLogger(FirstAggregation.class);
+ private final Logger logger = LoggerFactory.getLogger(FirstAggregation.class);
private final String dnsServerIpKey = "dnsServerIpMetric";
private final String dnsQnameKey = "dnsQnameMetric";
@@ -98,7 +98,7 @@ public class FirstAggregation extends AbstractFirstAggregation<DnsMetricLog> {
dnsQnameMetricMap.put(dnsQname, dnsQnameMetric);
}
} catch (Exception e) {
- LOG.warn("Illegal domain name" + e);
+ logger.warn("Illegal domain name" + e);
}
@@ -183,7 +183,7 @@ public class FirstAggregation extends AbstractFirstAggregation<DnsMetricLog> {
}
}
} catch (Exception e) {
- e.printStackTrace(System.out);
+ logger.error("dns pre metric first agg add failed: " + e.getMessage(), e);
}
}
diff --git a/module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/operator/AbstractFirstAggregation.java b/module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/operator/AbstractFirstAggregation.java
index df8ce33..9c6f463 100644
--- a/module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/operator/AbstractFirstAggregation.java
+++ b/module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/operator/AbstractFirstAggregation.java
@@ -6,6 +6,8 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.streaming.api.functions.ProcessFunction;
import org.apache.flink.streaming.api.windowing.time.Time;
import org.apache.flink.util.Collector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
@@ -14,6 +16,8 @@ import java.util.concurrent.ThreadLocalRandom;
public abstract class AbstractFirstAggregation<OUT> extends ProcessFunction<CnRecordLog, OUT> {
+ private final Logger logger = LoggerFactory.getLogger(AbstractFirstAggregation.class);
+
private long windowSize = Time.minutes(1).toMilliseconds();
private Long staggerOffset = null;
@@ -43,7 +47,7 @@ public abstract class AbstractFirstAggregation<OUT> extends ProcessFunction<CnRe
}
long currentProcessingTime = ctx.timerService().currentProcessingTime();
if (nextPrintTime != null && nextPrintTime <= currentProcessingTime) {
- System.out.println(currentProcessingTime + ":" + this.getClass().getName() + " one minute late data count :" + count);
+ logger.info(currentProcessingTime + ":" + this.getClass().getName() + " one minute late data count :" + count);
count = 0;
nextPrintTime = null;
}
diff --git a/module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/operator/FirstAggregation.java b/module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/operator/FirstAggregation.java
index 6b4112e..e6a7f32 100644
--- a/module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/operator/FirstAggregation.java
+++ b/module-CN-pre-metrics/src/main/java/com/zdjizhi/pre/operator/FirstAggregation.java
@@ -4,12 +4,16 @@ import com.zdjizhi.base.common.CnRecordLog;
import com.zdjizhi.pre.common.CnMetricLog;
import com.zdjizhi.pre.common.MetricKeyConfig;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
public class FirstAggregation extends AbstractFirstAggregation<CnMetricLog> {
+ private final Logger logger = LoggerFactory.getLogger(FirstAggregation.class);
+
private final String clientIpMetricKey = "clientIpMetric";
private final String serverIpMetricKey = "serverIpMetric";
private final String clientRegionMetricKey = "clientRegionMetric";
@@ -289,7 +293,7 @@ public class FirstAggregation extends AbstractFirstAggregation<CnMetricLog> {
}
}
} catch (Exception e) {
- e.printStackTrace(System.out);
+ logger.error("pre metric first agg add failed: " + e.getMessage(), e);
}
}
diff --git a/platform-base/src/main/java/com/zdjizhi/base/utils/FileByteUtils.java b/platform-base/src/main/java/com/zdjizhi/base/utils/FileByteUtils.java
index 817ddc0..c2b2ecf 100644
--- a/platform-base/src/main/java/com/zdjizhi/base/utils/FileByteUtils.java
+++ b/platform-base/src/main/java/com/zdjizhi/base/utils/FileByteUtils.java
@@ -5,11 +5,15 @@ import cn.hutool.core.io.IoUtil;
import com.zdjizhi.base.common.CommonConfig;
import com.zdjizhi.base.config.Configs;
import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.*;
public class FileByteUtils implements DFSUtils {
+ private final Logger logger = LoggerFactory.getLogger(FileByteUtils.class);
+
private static final String localRootPath = Configs.get(CommonConfig.DOWNLOAD_PATH);
public FileByteUtils() {
@@ -27,7 +31,7 @@ public class FileByteUtils implements DFSUtils {
fis = new FileInputStream(file);
data = IOUtils.toByteArray(fis);
} catch (IOException e) {
- System.out.println("download file " + filePath + " error, error message: " + e.getMessage());
+ logger.error("download file " + filePath + " error, error message: " + e.getMessage(), e);
} finally {
IOUtils.closeQuietly(fis);
}
diff --git a/platform-base/src/main/java/com/zdjizhi/base/utils/FileUtils.java b/platform-base/src/main/java/com/zdjizhi/base/utils/FileUtils.java
index bc2f694..54bfa11 100644
--- a/platform-base/src/main/java/com/zdjizhi/base/utils/FileUtils.java
+++ b/platform-base/src/main/java/com/zdjizhi/base/utils/FileUtils.java
@@ -3,20 +3,22 @@ package com.zdjizhi.base.utils;
import cn.hutool.crypto.digest.DigestUtil;
import com.zdjizhi.base.common.CommonConfig;
import com.zdjizhi.base.config.Configs;
-import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.Path;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
public class FileUtils {
+ private final Logger logger = LoggerFactory.getLogger(FileUtils.class);
+
private static DFSUtils dFSUtils;
public FileUtils(String clusterOrSingle) {
- if ("CLUSTER".equals(clusterOrSingle)){
+ if ("CLUSTER".equals(clusterOrSingle)) {
dFSUtils = new HdfsUtils();
}
- if ("SINGLE".equals(clusterOrSingle)){
+ if ("SINGLE".equals(clusterOrSingle)) {
dFSUtils = new FileByteUtils();
}
}
@@ -25,7 +27,7 @@ public class FileUtils {
long start = System.currentTimeMillis();
byte[] fileBytes = dFSUtils.getFileBytes(fileRelativePath);
long end = System.currentTimeMillis();
- System.out.println("file " + fileRelativePath + " download finished, speed " + (end - start) + " ms");
+ logger.info("file " + fileRelativePath + " download finished, speed " + (end - start) + " ms");
return fileBytes;
}
@@ -33,7 +35,7 @@ public class FileUtils {
long start = System.currentTimeMillis();
dFSUtils.uploadFileByBytes(fileRelativePath, bytes);
long end = System.currentTimeMillis();
- System.out.println("file " + fileRelativePath + " upload finished, speed " + (end - start) + " ms");
+ logger.info("file " + fileRelativePath + " upload finished, speed " + (end - start) + " ms");
}
public byte[] downloadFile(String fileName, String sha256) {
@@ -47,7 +49,7 @@ public class FileUtils {
} while (!downloadFileSha256.equals(sha256) && downloadCount < Configs.get(CommonConfig.KNOWLEDGE_FILE_CHECK_NUMBER));
if (!downloadFileSha256.equals(sha256)) {
content = new byte[0];
- System.out.println("broadcast stream download file " + fileName + " error, attempted more than " + Configs.get(CommonConfig.KNOWLEDGE_FILE_CHECK_NUMBER) + " times.");
+ logger.info("broadcast stream download file " + fileName + " error, attempted more than " + Configs.get(CommonConfig.KNOWLEDGE_FILE_CHECK_NUMBER) + " times.");
}
return content;
}
diff --git a/platform-base/src/main/java/com/zdjizhi/base/utils/HttpClientUtils.java b/platform-base/src/main/java/com/zdjizhi/base/utils/HttpClientUtils.java
index 952eb8e..6889a4e 100644
--- a/platform-base/src/main/java/com/zdjizhi/base/utils/HttpClientUtils.java
+++ b/platform-base/src/main/java/com/zdjizhi/base/utils/HttpClientUtils.java
@@ -9,7 +9,9 @@ import org.apache.http.*;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpRequestRetryHandler;
import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.*;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.client.utils.URIBuilder;
import org.apache.http.config.Registry;
@@ -32,9 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.net.ssl.*;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InterruptedIOException;
import java.net.URI;
import java.net.UnknownHostException;
@@ -337,7 +337,6 @@ public class HttpClientUtils {
// 获取响应信息
EntityUtils.consume(response.getEntity());
} catch (IOException e) {
- e.printStackTrace(System.out);
logger.error("current file: {},IO error:{}", url, e.getMessage());
} finally {
if (null != response) {
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/CustomKnowledge.java b/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/CustomKnowledge.java
index 39666c9..cfd25c0 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/CustomKnowledge.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/CustomKnowledge.java
@@ -2,6 +2,8 @@ package com.zdjizhi.etl.knowledge;
import cn.hutool.crypto.digest.DigestUtil;
import com.zdjizhi.base.utils.HttpClientUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
@@ -9,6 +11,8 @@ import java.util.Objects;
public class CustomKnowledge {
+ private static final Logger logger = LoggerFactory.getLogger(CustomKnowledge.class);
+
private final Map<Long, Map<String, Object>> metadataMap = new HashMap<>();
public void addMetadata(Map<String, Object> metadata) {
@@ -51,11 +55,11 @@ public class CustomKnowledge {
downloadFileSha256 = DigestUtil.sha256Hex(content);
downloadCount++;
if (!Objects.equals(downloadFileSha256, sha256)) {
- System.out.println("warning: file url: " + fileUrl + " download failed, download size : " + content.length + ", download sha256:" + downloadFileSha256 + ", hope sha256 is " + sha256);
+ logger.warn("warning: file url: " + fileUrl + " download failed, download size : " + content.length + ", download sha256:" + downloadFileSha256 + ", hope sha256 is " + sha256);
}
} while (!downloadFileSha256.equals(sha256) && downloadCount < maxRetry);
if (downloadCount >= maxRetry) {
- System.out.println("warning: file url: " + fileUrl + " download more than specified number of times");
+ logger.warn("warning: file url: " + fileUrl + " download more than specified number of times");
}
return content;
}
@@ -69,9 +73,9 @@ public class CustomKnowledge {
//content = httpClientUtils.httpGetInputStream(fileUrl, header);
content = httpClientUtils.httpGetInputStream(fileUrl);
long end = System.currentTimeMillis();
- System.out.println("download file " + fileUrl + " finished, speed " + (end - start) + " ms");
+ logger.info("download file " + fileUrl + " finished, speed " + (end - start) + " ms");
} catch (Exception e) {
- System.out.println("download file " + fileUrl + " error: " + e.getMessage());
+ logger.error("download file " + fileUrl + " error: " + e.getMessage(), e);
}
return content;
}
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/KnowledgeManager.java b/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/KnowledgeManager.java
index 5205578..0521bad 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/KnowledgeManager.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/KnowledgeManager.java
@@ -15,6 +15,8 @@ import com.zdjizhi.etl.utils.tag.AppTagUtils;
import com.zdjizhi.etl.utils.tag.DomainTagUtils;
import com.zdjizhi.etl.utils.tag.IpTagUtils;
import org.apache.flink.configuration.Configuration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -26,6 +28,8 @@ import java.util.Map;
public class KnowledgeManager {
+ private final Logger logger = LoggerFactory.getLogger(KnowledgeManager.class);
+
public Configuration configuration;
private final String KNOWLEDGE_EXPR;
@@ -43,9 +47,9 @@ public class KnowledgeManager {
}
public void processNacosInfo(String nacosInfo) {
- System.out.println(TimeUtils.getCurrentTime() + ": receive nacos config:" + nacosInfo);
+ logger.info(TimeUtils.getCurrentTime() + ": receive nacos config:" + nacosInfo);
ArrayList<Map<String, Object>> metaList = JsonPath.parse(nacosInfo).read(KNOWLEDGE_EXPR);
- System.out.println("resolve " + metaList.size() + " metadata from the config info pushed by nacos");
+ logger.info("resolve " + metaList.size() + " metadata from the config info pushed by nacos");
loadKnowledge(metaList);
}
@@ -142,7 +146,7 @@ public class KnowledgeManager {
AppTagUtils.updateTag(contents);
}
} catch (Exception e) {
- e.printStackTrace(System.out);
+ logger.error("nacos info load error:" + e.getMessage(), e);
if (isFirst) {
throw new RuntimeException("knowledge init fail:" + e.getMessage());
}
@@ -156,7 +160,7 @@ public class KnowledgeManager {
if (isFirst) {
throw new RuntimeException("download knowledge database error, type is :" + type);
} else {
- System.out.println("download knowledge database error, type:" + type + " ignored");
+ logger.error("download knowledge database error, type:" + type + " ignored");
return;
}
}
@@ -262,7 +266,7 @@ public class KnowledgeManager {
}
}
long end = System.currentTimeMillis();
- System.out.println("update " + type + " finished, speed " + (end - start) + " ms");
+ logger.info("update " + type + " finished, speed " + (end - start) + " ms");
}
private String buildExpr() {
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/NacosManager.java b/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/NacosManager.java
index 3fad6a4..0deaf96 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/NacosManager.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/knowledge/NacosManager.java
@@ -8,8 +8,11 @@ import com.alibaba.nacos.api.exception.NacosException;
import com.zdjizhi.base.common.CommonConfig;
import com.zdjizhi.base.common.CommonInternalConfig;
import com.zdjizhi.etl.utils.ip.IPUtils;
+import com.zdjizhi.etl.utils.tag.BaseTagUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.configuration.Configuration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
@@ -18,6 +21,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class NacosManager {
+ private final Logger logger = LoggerFactory.getLogger(BaseTagUtils.class);
+
private KnowledgeManager knowledgeManager;
private final Configuration configuration;
@@ -41,7 +46,7 @@ public class NacosManager {
knowledgeManager.loadFromLocal();
IPUtils.load();
} catch (Exception e) {
- e.printStackTrace(System.out);
+ logger.error("init from local failed :" + e.getMessage(), e);
throw new RuntimeException("init from local failed :" + e.getMessage());
}
} else {
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/rule/RuleUpdateListener.java b/platform-etl/src/main/java/com/zdjizhi/etl/rule/RuleUpdateListener.java
index 31e111a..4022b01 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/rule/RuleUpdateListener.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/rule/RuleUpdateListener.java
@@ -7,6 +7,8 @@ import com.zdjizhi.etl.utils.IocDarkWebUtils;
import com.zdjizhi.etl.utils.IocMalwareUtils;
import com.zdjizhi.etl.utils.tag.BaseTagUtils;
import org.apache.flink.configuration.Configuration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.concurrent.CountDownLatch;
@@ -15,6 +17,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public class RuleUpdateListener implements RuleCache.UpdateListener<Long, RuleInfo> {
+ private final Logger logger = LoggerFactory.getLogger(RuleUpdateListener.class);
+
private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
private final Configuration configuration;
@@ -52,7 +56,7 @@ public class RuleUpdateListener implements RuleCache.UpdateListener<Long, RuleIn
RuleCache instance = RuleCache.getInstance();
Collection<RuleInfo> ruleInfos = instance.getAll();
ruleInfos.forEach(ruleInfo -> doPut(ruleInfo.getRuleId(), ruleInfo));
- System.out.println("rule listener init process " + ruleInfos.size() + " rules");
+ logger.info("rule listener init process " + ruleInfos.size() + " rules");
} finally {
lock.writeLock().unlock();
}
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/AppUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/AppUtils.java
index 4716db6..161decf 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/AppUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/AppUtils.java
@@ -33,8 +33,7 @@ public class AppUtils {
newAppMap.put(appSketchLabel.getAppName(), appSketchLabel);
} catch (Exception lineException) {
- System.out.println("AppUtils line: " + line.toString() + " parse error:" + lineException);
- lineException.printStackTrace(System.out);
+ LOG.error("AppUtils line: " + line.toString() + " parse error:" + lineException, lineException);
}
}
appMap = newAppMap;
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/DnsServerUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/DnsServerUtils.java
index 8657a1b..dc177de 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/DnsServerUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/DnsServerUtils.java
@@ -36,8 +36,7 @@ public class DnsServerUtils {
newDnsMap.put(ip, tags);
}
} catch (Exception lineException) {
- System.out.println("DnsServerUtils line: " + line.toString() + " parse error:" + lineException);
- lineException.printStackTrace(System.out);
+ LOG.error("DnsServerUtils line: " + line.toString() + " parse error:" + lineException, lineException);
}
}
dnsMap = newDnsMap;
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/IdcRenterUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/IdcRenterUtils.java
index 8b61cb8..4d48c17 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/IdcRenterUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/IdcRenterUtils.java
@@ -53,8 +53,7 @@ public class IdcRenterUtils {
newTreeRangeMap.put(Range.closed(new IPAddress(startIpAddress), new IPAddress(endIpAddress)), idcRenter);
}
} catch (Exception lineException) {
- System.out.println("IdcRenterUtils line: " + line.toString() + " parse error:" + lineException);
- lineException.printStackTrace(System.out);
+ LOG.error("IdcRenterUtils line: " + line.toString() + " parse error:" + lineException, lineException);
}
}
treeRangeMap = newTreeRangeMap;
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocDarkWebUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocDarkWebUtils.java
index 2a3ccae..e344f17 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocDarkWebUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocDarkWebUtils.java
@@ -36,8 +36,7 @@ public class IocDarkWebUtils {
newDomainMap.put(value, nodeType);
}
} catch (Exception lineException) {
- System.out.println("DnsServerUtils line: " + line.toString() + " parse error:" + lineException);
- lineException.printStackTrace(System.out);
+ LOG.error("DnsServerUtils line: " + line.toString() + " parse error:" + lineException, lineException);
}
}
ipMap = newIpMap;
@@ -78,7 +77,7 @@ public class IocDarkWebUtils {
if (tagRuleIdMap.containsKey(ruleInfo.getName())) {
//id and name not change
if (tagRuleIdMap.get(ruleInfo.getName()) != ruleInfo.getRuleId()) {
- System.out.println(TimeUtils.getCurrentTime() + ": ioc dark web warn: the name " + ruleInfo.getName() + " have been used by rule id " + tagRuleIdMap.get(ruleInfo.getName()));
+ LOG.info("ioc dark web warn: the name " + ruleInfo.getName() + " have been used by rule id " + tagRuleIdMap.get(ruleInfo.getName()));
for (String ruleName : tagRuleIdMap.keySet()) {
if (tagRuleIdMap.get(ruleName) == ruleInfo.getRuleId()) {
tagRuleIdMap.remove(ruleName);
@@ -87,7 +86,7 @@ public class IocDarkWebUtils {
}
tagRuleIdMap.put(ruleInfo.getName(), ruleInfo.getRuleId());
} else {
- System.out.println(TimeUtils.getCurrentTime() + ": ioc dark web receive the rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+ LOG.info("ioc dark web receive the rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
}
} else {
tagRuleIdMap.put(ruleInfo.getName(), ruleInfo.getRuleId());
@@ -97,13 +96,13 @@ public class IocDarkWebUtils {
break;
}
}
- System.out.println(TimeUtils.getCurrentTime() + ": ioc dark web update rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+ LOG.info("ioc dark web update rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
}
} else {
if (tagRuleIdMap.containsKey(ruleInfo.getName())) {
- System.out.println(TimeUtils.getCurrentTime() + ": ioc dark web warn: the name " + ruleInfo.getName() + " have been used by rule id " + tagRuleIdMap.get(ruleInfo.getName()));
+ LOG.info("ioc dark web warn: the name " + ruleInfo.getName() + " have been used by rule id " + tagRuleIdMap.get(ruleInfo.getName()));
} else {
- System.out.println(TimeUtils.getCurrentTime() + ": ioc dark web add rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+ LOG.info("ioc dark web add rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
}
tagRuleIdMap.put(ruleInfo.getName(), ruleInfo.getRuleId());
}
@@ -111,7 +110,7 @@ public class IocDarkWebUtils {
public static void removeInternalRuleId(Long key, RuleInfo ruleInfo) {
tagRuleIdMap.remove(ruleInfo.getName().toLowerCase());
- System.out.println(TimeUtils.getCurrentTime() + ": ioc dark web remove rule : " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+ LOG.info("ioc dark web remove rule : " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
}
private static String getDomainTag(String domain) {
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocMalwareUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocMalwareUtils.java
index bf6bbb8..7802fa5 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocMalwareUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocMalwareUtils.java
@@ -41,8 +41,7 @@ public class IocMalwareUtils {
newUrlTrie.put(value, malwareName);
}
} catch (Exception lineException) {
- System.out.println("DnsServerUtils line: " + line.toString() + " parse error:" + lineException);
- lineException.printStackTrace(System.out);
+ LOG.error("DnsServerUtils line: " + line.toString() + " parse error:" + lineException, lineException);
}
}
ipMap = newIpMap;
@@ -94,7 +93,7 @@ public class IocMalwareUtils {
if (tagRuleIdMap.containsKey(ruleInfo.getName())) {
//id and name not change
if (tagRuleIdMap.get(ruleInfo.getName()) != ruleInfo.getRuleId()) {
- System.out.println(TimeUtils.getCurrentTime() + ": ioc malware warn: the name " + ruleInfo.getName() + " have been used by rule id " + tagRuleIdMap.get(ruleInfo.getName()));
+ LOG.info("ioc malware warn: the name " + ruleInfo.getName() + " have been used by rule id " + tagRuleIdMap.get(ruleInfo.getName()));
for (String ruleName : tagRuleIdMap.keySet()) {
if (tagRuleIdMap.get(ruleName) == ruleInfo.getRuleId()) {
tagRuleIdMap.remove(ruleName);
@@ -103,7 +102,7 @@ public class IocMalwareUtils {
}
tagRuleIdMap.put(ruleInfo.getName(), ruleInfo.getRuleId());
} else {
- System.out.println(TimeUtils.getCurrentTime() + ": ioc malware receive the rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+ LOG.info("ioc malware receive the rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
}
} else {
tagRuleIdMap.put(ruleInfo.getName(), ruleInfo.getRuleId());
@@ -113,13 +112,13 @@ public class IocMalwareUtils {
break;
}
}
- System.out.println(TimeUtils.getCurrentTime() + ": ioc malware update rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+ LOG.info("ioc malware update rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
}
} else {
if (tagRuleIdMap.containsKey(ruleInfo.getName())) {
- System.out.println(TimeUtils.getCurrentTime() + ": ioc malware warn: the name " + ruleInfo.getName() + " have been used by rule id " + tagRuleIdMap.get(ruleInfo.getName()));
+ LOG.info("ioc malware warn: the name " + ruleInfo.getName() + " have been used by rule id " + tagRuleIdMap.get(ruleInfo.getName()));
} else {
- System.out.println(TimeUtils.getCurrentTime() + ": ioc malware add rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+ LOG.info("ioc malware add rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
}
tagRuleIdMap.put(ruleInfo.getName(), ruleInfo.getRuleId());
}
@@ -127,7 +126,7 @@ public class IocMalwareUtils {
public static void removeInternalRuleId(Long key, RuleInfo ruleInfo) {
tagRuleIdMap.remove(ruleInfo.getName().toLowerCase());
- System.out.println(TimeUtils.getCurrentTime() + ": ioc malware remove rule : " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+ LOG.info("ioc malware remove rule : " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
}
private static String getDomainTags(String domain) {
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/LinkUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/LinkUtils.java
index 8dce777..2b1811a 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/LinkUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/LinkUtils.java
@@ -30,8 +30,7 @@ public class LinkUtils {
newLinkMap.put(linkId, peerCity);
} catch (Exception lineException) {
- System.out.println("LinkUtils line: " + line.toString() + " parse error:" + lineException);
- lineException.printStackTrace(System.out);
+ LOG.error("LinkUtils line: " + line.toString() + " parse error:" + lineException, lineException);
}
}
linkMap = newLinkMap;
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/PsiphonUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/PsiphonUtils.java
index a88ff9a..41921ea 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/PsiphonUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/PsiphonUtils.java
@@ -61,8 +61,7 @@ public class PsiphonUtils {
newTreeRangeMap.put(Range.closed(new IPAddress(startIpAddress), new IPAddress(endIpAddress)), type);
}
} catch (Exception lineException) {
- System.out.println("IdcRenterUtils line: " + line.toString() + " parse error:" + lineException);
- lineException.printStackTrace(System.out);
+ LOG.error("IdcRenterUtils line: " + line.toString() + " parse error:" + lineException, lineException);
}
}
treeRangeMap = newTreeRangeMap;
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/csv/HighCsvReader.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/csv/HighCsvReader.java
index c67fbff..7a95f45 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/csv/HighCsvReader.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/csv/HighCsvReader.java
@@ -13,7 +13,7 @@ import java.util.*;
public class HighCsvReader {
- private static final Logger LOG = LoggerFactory.getLogger(HighCsvReader.class);
+ private final Logger logger = LoggerFactory.getLogger(HighCsvReader.class);
private CSVReader csvReader;
@@ -59,8 +59,7 @@ public class HighCsvReader {
data.add(lineData);
}
} catch (Exception e) {
- System.out.println("csv parse error, error exception: " + e);
- e.printStackTrace(System.out);
+ logger.error("csv parse error, error exception: " + e.getMessage(), e);
} finally {
if (csvReader != null) {
try {
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/CategoryUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/CategoryUtils.java
index d26c276..28ce413 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/CategoryUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/CategoryUtils.java
@@ -37,8 +37,7 @@ public class CategoryUtils {
newCategoryMap.put(fqdn, catalog);
} catch (Exception lineException) {
- System.out.println("FcUtils fqdn file line: " + line.toString() + " parse error:" + lineException);
- lineException.printStackTrace(System.out);
+ logger.error("FcUtils fqdn file line: " + line.toString() + " parse error:" + lineException, lineException);
}
}
categoryMap = newCategoryMap;
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/IcpUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/IcpUtils.java
index fbe4907..e88aff6 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/IcpUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/IcpUtils.java
@@ -26,7 +26,7 @@ public class IcpUtils {
newIcpMap.put(fqdn, icpCompanyName);
} catch (Exception lineException) {
- System.out.println("FcUtils icp file line: " + line.toString() + " parse error:" + lineException.getMessage());
+ logger.error("FcUtils icp file line: " + line.toString() + " parse error:" + lineException.getMessage(), lineException);
}
}
icpMap = newIcpMap;
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/WhoisUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/WhoisUtils.java
index 65a47de..c307926 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/WhoisUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/fqdn/WhoisUtils.java
@@ -31,8 +31,7 @@ public class WhoisUtils {
newWhoIsMap.put(fqdn, whoisRegistrantOrg);
} catch (Exception lineException) {
- System.out.println("WhoisUtils line: " + line.toString() + " parse error:" + lineException);
- lineException.printStackTrace(System.out);
+ LOG.error("WhoisUtils line: " + line.toString() + " parse error:" + lineException, lineException);
}
}
whoIsMap = newWhoIsMap;
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/ip/InternalIpUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/ip/InternalIpUtils.java
index a0ae6d1..7655ff0 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/ip/InternalIpUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/ip/InternalIpUtils.java
@@ -77,8 +77,7 @@ public class InternalIpUtils {
newTreeRangeSet.add(Range.closed(new IPAddress(startIpAddress), new IPAddress(endIpAddress)));
}
} catch (Exception lineException) {
- System.out.println("IpUtils line: " + line.toString() + " parse error:" + lineException);
- lineException.printStackTrace(System.out);
+ logger.error("IpUtils line: " + line.toString() + " parse error:" + lineException, lineException);
}
}
treeRangeSet = newTreeRangeSet;
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/tag/BaseTagUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/tag/BaseTagUtils.java
index 15e7dbb..3963db5 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/tag/BaseTagUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/tag/BaseTagUtils.java
@@ -2,7 +2,8 @@ package com.zdjizhi.etl.utils.tag;
import com.zdjizhi.base.common.CnRecordLog;
import com.zdjizhi.base.rule.info.RuleInfo;
-import com.zdjizhi.etl.utils.TimeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.HashMap;
@@ -10,10 +11,12 @@ import java.util.List;
import java.util.Map;
public class BaseTagUtils {
+
+ private static final Logger logger = LoggerFactory.getLogger(BaseTagUtils.class);
private static final Map<Long, List<Long>> libraryIdRuleIdMap = new HashMap<>();
public static void updateInternalRuleId(Long key, RuleInfo ruleInfo) {
- System.out.println(TimeUtils.getCurrentTime() + ": tagUtils update rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+ logger.info("tagUtils update rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
long ruleId = ruleInfo.getRuleId();
RuleInfo.RuleConfig ruleConfig = ruleInfo.getRuleConfig();
if (ruleConfig instanceof RuleInfo.IndicatorMatchConfig) {
@@ -29,7 +32,7 @@ public class BaseTagUtils {
}
public static void removeInternalRuleId(Long key, RuleInfo ruleInfo) {
- System.out.println(TimeUtils.getCurrentTime() + ": tagUtils remove rule : " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+ logger.info("tagUtils remove rule : " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
RuleInfo.RuleConfig ruleConfig = ruleInfo.getRuleConfig();
if (ruleConfig instanceof RuleInfo.IndicatorMatchConfig) {
Long libraryId = ((RuleInfo.IndicatorMatchConfig) ruleConfig).getLibraryId();
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/tag/IpTagUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/tag/IpTagUtils.java
index 98b491c..24a3997 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/tag/IpTagUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/tag/IpTagUtils.java
@@ -98,7 +98,7 @@ public class IpTagUtils {
startIpAddress = ipAddressLower;
endIpAddress = ipAddressUpper;
} else {
- System.out.println("unknown addrFormat: " + addrFormat);
+ logger.warn("unknown addrFormat: " + addrFormat);
continue;
}
@@ -117,8 +117,7 @@ public class IpTagUtils {
}
treeRangeMap.putAll(subRangeMap);
} catch (Exception lineException) {
- System.out.println("ip tag line: " + line.toString() + " parse error:" + lineException);
- lineException.printStackTrace(System.out);
+ logger.error("ip tag line: " + line.toString() + " parse error:" + lineException, lineException);
}
}
} catch (Exception e) {
diff --git a/platform-schedule/src/main/java/com/zdjizhi/schedule/Execute.java b/platform-schedule/src/main/java/com/zdjizhi/schedule/Execute.java
index f30fee0..d981d28 100644
--- a/platform-schedule/src/main/java/com/zdjizhi/schedule/Execute.java
+++ b/platform-schedule/src/main/java/com/zdjizhi/schedule/Execute.java
@@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.Map;
-import java.util.Properties;
public class Execute {
private static final Logger logger = LoggerFactory.getLogger(Execute.class);
@@ -39,7 +38,7 @@ public class Execute {
}
FlinkEnvironmentUtils.streamExeEnv.execute(Configs.get(CommonConfig.STREAM_EXECUTION_JOB_NAME));
}catch (Exception e){
- e.printStackTrace(System.out);
+ logger.error("任务调度异常:" + e.getMessage(), e);
throw new RuntimeException("任务调度异常", e);
}
}