diff --git a/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/topic/impl/TopicStateManagerImpl.java b/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/topic/impl/TopicStateManagerImpl.java index 4c4781da..e4b8a147 100644 --- a/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/topic/impl/TopicStateManagerImpl.java +++ b/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/topic/impl/TopicStateManagerImpl.java @@ -307,7 +307,7 @@ public class TopicStateManagerImpl implements TopicStateManager { if (metricsResult.failed()) { // 仅打印错误日志,但是不直接返回错误 log.error( - "class=TopicStateManagerImpl||method=getTopicPartitions||clusterPhyId={}||topicName={}||result={}||msg=get metrics from es failed", + "method=getTopicPartitions||clusterPhyId={}||topicName={}||result={}||msg=get metrics from es failed", clusterPhyId, topicName, metricsResult ); } diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/zookeeper/fourletterword/parser/ConfigCmdDataParser.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/zookeeper/fourletterword/parser/ConfigCmdDataParser.java index 35ec153b..7f27073c 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/zookeeper/fourletterword/parser/ConfigCmdDataParser.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/zookeeper/fourletterword/parser/ConfigCmdDataParser.java @@ -99,13 +99,13 @@ public class ConfigCmdDataParser implements FourLetterWordDataParser(null, getJsonContentHeaders(headers)), String.class); return JSON.parseObject(result.getBody(), resultType); } catch (Exception e){ - LOGGER.error("class=RestTool||method=getForObject||url={}||msg=exception!", url, e); + LOGGER.error("method=getForObject||url={}||msg=exception!", url, e); } return null; @@ -151,7 +151,7 @@ public class RestTool { new HttpEntity<>(null, headers), String.class); return JSON.parseObject(result.getBody(), resultType); } catch (Exception e){ - LOGGER.error("class=RestTool||method=getForObject||url={}||msg=exception!", url, e); + LOGGER.error("method=getForObject||url={}||msg=exception!", url, e); } return null; diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/enums/version/VersionItemTypeEnum.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/enums/version/VersionItemTypeEnum.java index 004dad6d..7136e114 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/enums/version/VersionItemTypeEnum.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/enums/version/VersionItemTypeEnum.java @@ -4,14 +4,14 @@ public enum VersionItemTypeEnum { /** * 指标 */ - METRIC_TOPIC(100, "topic_metric"), - METRIC_CLUSTER(101, "cluster_metric"), - METRIC_GROUP(102, "group_metric"), - METRIC_BROKER(103, "broker_metric"), - METRIC_PARTITION(104, "partition_metric"), - METRIC_REPLICATION(105, "replication_metric"), + METRIC_TOPIC(100, "TopicMetric"), + METRIC_CLUSTER(101, "ClusterMetric"), + METRIC_GROUP(102, "GroupMetric"), + METRIC_BROKER(103, "BrokerMetric"), + METRIC_PARTITION(104, "PartitionMetric"), + METRIC_REPLICATION(105, "ReplicaMetric"), - METRIC_ZOOKEEPER(110, "zookeeper_metric"), + METRIC_ZOOKEEPER(110, "ZookeeperMetric"), /** * 服务端查询 diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/CommonUtils.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/CommonUtils.java index f0a42192..1c451609 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/CommonUtils.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/CommonUtils.java @@ -61,7 +61,7 @@ public class CommonUtils { //转换为16进制 return new BigInteger(1, digest).toString(16); } catch (Exception e) { - LOGGER.error("class=CommonUtils||method=getMD5||msg=获取文件的md5失败:{}", e.getMessage()); + LOGGER.error("method=getMD5||msg=获取文件的md5失败:{}", e.getMessage()); } return null; } diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/ConvertUtil.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/ConvertUtil.java index 71b611fd..10e87ca8 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/ConvertUtil.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/ConvertUtil.java @@ -210,7 +210,7 @@ public class ConvertUtil { BeanUtils.copyProperties(srcObj, tgt); consumer.accept(tgt); } catch (Exception e) { - LOGGER.warn("class=ConvertUtil||method=obj2Obj||msg={}", e.getMessage()); + LOGGER.warn("method=obj2Obj||msg={}", e.getMessage()); } return tgt; @@ -236,7 +236,7 @@ public class ConvertUtil { try { map.put(field.getName(), field.get(obj)); } catch (IllegalAccessException e) { - LOGGER.warn("class=ConvertUtil||method=Obj2Map||msg={}", e.getMessage(), e); + LOGGER.warn("method=Obj2Map||msg={}", e.getMessage(), e); } } return map; @@ -256,7 +256,7 @@ public class ConvertUtil { field.set(obj, map.get(field.getName())); } } catch (Exception e) { - LOGGER.warn("class=ConvertUtil||method=map2Obj||msg={}", e.getMessage(), e); + LOGGER.warn("method=map2Obj||msg={}", e.getMessage(), e); } return obj; diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/FutureNoWaitUtil.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/FutureNoWaitUtil.java index 378abaf6..5e7ca714 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/FutureNoWaitUtil.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/FutureNoWaitUtil.java @@ -64,7 +64,7 @@ public class FutureNoWaitUtil { while (true) { FutureTaskDelayQueueData data = null; try { - LOGGER.debug("class=FutureNoWaitUtil||method=runCheck||delayQueueSize={}", delayQueueData.size()); + LOGGER.debug("method=runCheck||delayQueueSize={}", delayQueueData.size()); while (true) { data = delayQueueData.take(); @@ -81,7 +81,7 @@ public class FutureNoWaitUtil { // 停1000ms Thread.sleep(1000); } catch (Exception e) { - LOGGER.error("class=FutureNoWaitUtil||method=runCheck||taskName={}||errMsg=exception!", data == null? "": data.getTaskName(), e); + LOGGER.error("method=runCheck||taskName={}||errMsg=exception!", data == null? "": data.getTaskName(), e); } } } diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/FutureWaitUtil.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/FutureWaitUtil.java index e62efb8b..28388358 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/FutureWaitUtil.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/FutureWaitUtil.java @@ -123,11 +123,11 @@ public class FutureWaitUtil { } // 达到超时时间,但是任务未完成,则打印日志并强制取消 - LOGGER.error("class=FutureUtil||method=waitExecute||taskName={}||msg=cancel task", queueData.getTaskName()); + LOGGER.error("method=waitExecute||taskName={}||msg=cancel task", queueData.getTaskName()); queueData.getFutureTask().cancel(true); } catch (Exception e) { - LOGGER.error("class=FutureUtil||method=waitExecute||msg=exception", e); + LOGGER.error("method=waitExecute||msg=exception", e); } } @@ -155,7 +155,7 @@ public class FutureWaitUtil { return queueData.getFutureTask().get(stepWaitTimeUnitMs, TimeUnit.MILLISECONDS); } catch (Exception e) { // 达到超时时间,但是任务未完成,则打印日志并强制取消 - LOGGER.error("class=FutureUtil||method=stepWaitResult||taskName={}||errMsg=exception", queueData.getTaskName(), e); + LOGGER.error("method=stepWaitResult||taskName={}||errMsg=exception", queueData.getTaskName(), e); } return null; diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/PaginationMetricsUtil.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/PaginationMetricsUtil.java index 9d732917..c7fcad77 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/PaginationMetricsUtil.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/PaginationMetricsUtil.java @@ -163,7 +163,7 @@ public class PaginationMetricsUtil { try { Field defaultField = FieldUtils.getField(allDataList.get(0).getClass(), defaultSortField, true); if(ValidateUtils.anyNull(defaultField)) { - log.debug("class=PaginationMetricsUtil||method=sortMetrics||className={}||metricName={}||defaultFieldName={}||metricSortType={}||msg=default field not exist.", + log.debug("method=sortMetrics||className={}||metricName={}||defaultFieldName={}||metricSortType={}||msg=default field not exist.", allDataList.get(0).getClass().getSimpleName(), metricName, defaultSortField, sortType); // 字段不存在,则排序失效,直接返回 @@ -172,7 +172,7 @@ public class PaginationMetricsUtil { Collections.sort(allDataList, (a1, a2) -> sortMetricsObject(a1, a2, metricName, defaultField)); } catch (Exception e) { - log.debug("class=PaginationMetricsUtil||method=sortMetrics||className={}||metricName={}||defaultFieldName={}||metricSortType={}||errMsg=exception.", + log.debug("method=sortMetrics||className={}||metricName={}||defaultFieldName={}||metricSortType={}||errMsg=exception.", allDataList.get(0).getClass().getSimpleName(), metricName, defaultSortField, sortType, e); } @@ -214,7 +214,7 @@ public class PaginationMetricsUtil { return 0; } catch (Exception e) { - log.debug("class=PaginationMetricsUtil||method=sortMetricsObject||metricsA={}||metricsB={}||metricName={}||defaultFieldName={}||errMsg=exception.", + log.debug("method=sortMetricsObject||metricsA={}||metricsB={}||metricName={}||defaultFieldName={}||errMsg=exception.", a1, a2, metricName, defaultField.getName(), e); } diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/RetryExecutor.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/RetryExecutor.java index fcf675e4..8b68a460 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/RetryExecutor.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/RetryExecutor.java @@ -94,12 +94,12 @@ public class RetryExecutor { } } catch (Exception e) { if (!handler.needRetry(e) || tryCount == retryCount) { - LOGGER.warn("class=RetryExecutor||method=execute||errMsg={}||handlerName={}||tryCount={}", + LOGGER.warn("method=execute||errMsg={}||handlerName={}||tryCount={}", e.getMessage(), name, tryCount, e); throw e; } - LOGGER.warn("class=RetryExecutor||method=execute||errMsg={}||handlerName={}||tryCount={}||maxTryCount={}", + LOGGER.warn("method=execute||errMsg={}||handlerName={}||tryCount={}||maxTryCount={}", e.getMessage(), name, tryCount,retryCount); } } while (tryCount++ < retryCount); diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/zookeeper/FourLetterWordUtil.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/zookeeper/FourLetterWordUtil.java index a3ae31af..5c798b7c 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/zookeeper/FourLetterWordUtil.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/zookeeper/FourLetterWordUtil.java @@ -56,7 +56,7 @@ public class FourLetterWordUtil { return Result.buildSuc(dataParser.parseAndInitData(clusterPhyId, host, port, cmdData)); } catch (Exception e) { LOGGER.error( - "class=FourLetterWordUtil||method=executeFourLetterCmd||clusterPhyId={}||host={}||port={}||cmd={}||secure={}||timeout={}||errMsg=exception!", + "method=executeFourLetterCmd||clusterPhyId={}||host={}||port={}||cmd={}||secure={}||timeout={}||errMsg=exception!", clusterPhyId, host, port, dataParser.getCmd(), secure, timeout, e ); @@ -124,7 +124,7 @@ public class FourLetterWordUtil { outputStream.close(); } catch (IOException e) { LOGGER.error( - "class=FourLetterWordUtil||method=send4LetterWord||clusterPhyId={}||host={}||port={}||cmd={}||secure={}||timeout={}||errMsg=exception!", + "method=send4LetterWord||clusterPhyId={}||host={}||port={}||cmd={}||secure={}||timeout={}||errMsg=exception!", host, port, cmd, secure, timeout, e ); } @@ -135,7 +135,7 @@ public class FourLetterWordUtil { bufferedReader.close(); } catch (IOException e) { LOGGER.error( - "class=FourLetterWordUtil||method=send4LetterWord||host={}||port={}||cmd={}||secure={}||timeout={}||errMsg=exception!", + "method=send4LetterWord||host={}||port={}||cmd={}||secure={}||timeout={}||errMsg=exception!", host, port, cmd, secure, timeout, e ); } @@ -146,7 +146,7 @@ public class FourLetterWordUtil { socket.close(); } catch (IOException e) { LOGGER.error( - "class=FourLetterWordUtil||method=send4LetterWord||host={}||port={}||cmd={}||secure={}||timeout={}||errMsg=exception!", + "method=send4LetterWord||host={}||port={}||cmd={}||secure={}||timeout={}||errMsg=exception!", host, port, cmd, secure, timeout, e ); } diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/flusher/ZKWatcherManager.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/flusher/ZKWatcherManager.java index e2bd1e2c..0a8a865d 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/flusher/ZKWatcherManager.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/flusher/ZKWatcherManager.java @@ -43,14 +43,14 @@ public class ZKWatcherManager extends AbstractClusterLoadedChangedHandler { try { FutureUtil.quickStartupFutureUtil.submitTask( () -> { - log.debug("class={}||method=scheduledTriggerFlush||clusterPhyId={}||msg=flush task start" + log.debug("runClass={}||method=scheduledTriggerFlush||clusterPhyId={}||msg=flush task start" , abstractZKWatcher.getClass().getSimpleName(), clusterPhy.getId()); long startTime = System.currentTimeMillis(); abstractZKWatcher.flush(clusterPhy); - log.info("class={}||method=scheduledTriggerFlush||clusterPhyId={}||costTime={}ms||msg=flush task finished" + log.info("runClass={}||method=scheduledTriggerFlush||clusterPhyId={}||costTime={}ms||msg=flush task finished" , abstractZKWatcher.getClass().getSimpleName(), clusterPhy.getId(), System.currentTimeMillis() - startTime); }); } catch (Exception e) { diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerMetricServiceImpl.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerMetricServiceImpl.java index 50bf69d4..52a90ad2 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerMetricServiceImpl.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerMetricServiceImpl.java @@ -58,7 +58,7 @@ import static com.xiaojukeji.know.streaming.km.common.enums.version.VersionEnum. */ @Service public class BrokerMetricServiceImpl extends BaseMetricService implements BrokerMetricService { - protected static final ILog LOGGER = LogFactory.getLog("METRIC_LOGGER"); + protected static final ILog LOGGER = LogFactory.getLog(BrokerMetricServiceImpl.class); public static final String BROKER_METHOD_DO_NOTHING = "doNothing"; public static final String BROKER_METHOD_GET_METRIC_FROM_KAFKA_BY_JMX = "getMetricFromKafkaByJMX"; diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/group/impl/GroupMetricServiceImpl.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/group/impl/GroupMetricServiceImpl.java index 5112d57f..0299a67f 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/group/impl/GroupMetricServiceImpl.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/group/impl/GroupMetricServiceImpl.java @@ -221,7 +221,7 @@ public class GroupMetricServiceImpl extends BaseMetricService implements GroupMe return Result.buildSuc(metricsList); } catch (Exception e) { - LOGGER.error("class=GroupMetricServiceImpl||method=getLagFromAdminClient||clusterPhyId={}||groupName={}||metrics={}||msg=exception", clusterId, groupName, metric, e); + LOGGER.error("method=getLagFromAdminClient||clusterPhyId={}||groupName={}||metrics={}||msg=exception", clusterId, groupName, metric, e); return Result.buildFailure(VC_KAFKA_CLIENT_ERROR); } } diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/version/BaseVersionControlService.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/version/BaseVersionControlService.java index 08628498..cb35befd 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/version/BaseVersionControlService.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/version/BaseVersionControlService.java @@ -10,7 +10,6 @@ import com.xiaojukeji.know.streaming.km.common.bean.entity.version.VersionMethod import com.xiaojukeji.know.streaming.km.common.enums.version.VersionEnum; import com.xiaojukeji.know.streaming.km.common.enums.version.VersionItemTypeEnum; import com.xiaojukeji.know.streaming.km.common.exception.VCHandlerNotExistException; -import com.xiaojukeji.know.streaming.km.common.utils.EnvUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.DependsOn; import org.springframework.util.CollectionUtils; @@ -25,7 +24,7 @@ import java.util.function.Function; */ @DependsOn("versionControlService") public abstract class BaseVersionControlService { - protected static final ILog LOGGER = LogFactory.getLog("METRIC_LOGGER"); + protected static final ILog LOGGER = LogFactory.getLog(BaseVersionControlService.class); @Autowired protected VersionControlService versionControlService; @@ -61,10 +60,11 @@ public abstract class BaseVersionControlService { String methodName = getMethodName(clusterPhyId, action); Object ret = versionControlService.doHandler(getVersionItemType(), methodName, param); - if(!EnvUtil.isOnline()){ - LOGGER.info("method=doVCHandler||clusterId={}||action={}||methodName={}||type={}param={}||ret={}}!", - clusterPhyId, action, methodName, getVersionItemType().getMessage(), JSON.toJSONString(param), JSON.toJSONString(ret)); - } + LOGGER.debug( + "method=doVCHandler||clusterId={}||action={}||methodName={}||type={}param={}||ret={}!", + clusterPhyId, action, methodName, getVersionItemType().getMessage(), JSON.toJSONString(param), JSON.toJSONString(ret) + ); + return ret; } diff --git a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/BaseESDAO.java b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/BaseESDAO.java index 62bc6a57..48949f65 100644 --- a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/BaseESDAO.java +++ b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/BaseESDAO.java @@ -1,7 +1,7 @@ package com.xiaojukeji.know.streaming.km.persistence.es; import com.didiglobal.logi.log.ILog; -import com.didiglobal.logi.log.LogFactory; +import com.xiaojukeji.know.streaming.km.common.utils.LoggerUtil; import com.xiaojukeji.know.streaming.km.persistence.es.dsls.DslLoaderUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; * 直接操作es集群的dao */ public abstract class BaseESDAO { - protected static final ILog LOGGER = LogFactory.getLog("ES_LOGGER"); + protected static final ILog LOGGER = LoggerUtil.getESLogger(); /** * 加载查询语句工具类 diff --git a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dao/BaseMetricESDAO.java b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dao/BaseMetricESDAO.java index 39c9ef44..568ac34e 100644 --- a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dao/BaseMetricESDAO.java +++ b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dao/BaseMetricESDAO.java @@ -65,7 +65,7 @@ public class BaseMetricESDAO extends BaseESDAO { esOpClient.createIndex(realIndex); } - }catch (Exception e){ + } catch (Exception e) { LOGGER.error("method=checkCurrentDayIndexExist||errMsg=exception!", e); } } diff --git a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dao/ZookeeperMetricESDAO.java b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dao/ZookeeperMetricESDAO.java index 8b391a3a..dc19d2b8 100644 --- a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dao/ZookeeperMetricESDAO.java +++ b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dao/ZookeeperMetricESDAO.java @@ -59,7 +59,7 @@ public class ZookeeperMetricESDAO extends BaseMetricESDAO { ESConstant.DEFAULT_RETRY_TIME ); } catch (Exception e){ - LOGGER.error("class=ZookeeperMetricESDAO||method=listMetricsByClusterPhyId||clusterPhyId={}||errMsg=exception!", + LOGGER.error("method=listMetricsByClusterPhyId||clusterPhyId={}||errMsg=exception!", clusterPhyId, e ); } diff --git a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dsls/DslLoaderUtil.java b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dsls/DslLoaderUtil.java index fda0238f..6bdea995 100644 --- a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dsls/DslLoaderUtil.java +++ b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dsls/DslLoaderUtil.java @@ -7,10 +7,10 @@ import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.SerializerFeature; import com.didiglobal.logi.log.ILog; -import com.didiglobal.logi.log.LogFactory; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.xiaojukeji.know.streaming.km.common.utils.EnvUtil; +import com.xiaojukeji.know.streaming.km.common.utils.LoggerUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -34,7 +34,7 @@ import java.util.Map; */ @Component public class DslLoaderUtil { - private static final ILog LOGGER = LogFactory.getLog("ES_LOGGER"); + private static final ILog LOGGER = LoggerUtil.getESLogger(); /** * 查询语句容器 */ @@ -42,7 +42,7 @@ public class DslLoaderUtil { @PostConstruct public void init() { - LOGGER.info("class=DslLoaderUtil||method=init||DslLoaderUtil init start."); + LOGGER.info("method=init||DslLoaderUtil init start."); List dslFileNames = Lists.newLinkedList(); // 反射获取接口中定义的变量中的值 @@ -52,7 +52,7 @@ public class DslLoaderUtil { try { dslFileNames.add(fields[i].get(null).toString()); } catch (IllegalAccessException e) { - LOGGER.error("class=DslLoaderUtil||method=init||errMsg=fail to read {} error. ", fields[i].getName(), + LOGGER.error("method=init||errMsg=fail to read {} error. ", fields[i].getName(), e); } } @@ -63,13 +63,13 @@ public class DslLoaderUtil { } // 输出加载的查询语句 - LOGGER.info("class=DslLoaderUtil||method=init||msg=dsl files count {}", dslsMap.size()); + LOGGER.info("method=init||msg=dsl files count {}", dslsMap.size()); for (Map.Entry entry : dslsMap.entrySet()) { - LOGGER.info("class=DslLoaderUtil||method=init||msg=file name {}, dsl content {}", entry.getKey(), + LOGGER.info("method=init||msg=file name {}, dsl content {}", entry.getKey(), entry.getValue()); } - LOGGER.info("class=DslLoaderUtil||method=init||DslLoaderUtil init finished."); + LOGGER.info("method=init||DslLoaderUtil init finished."); } /** @@ -93,7 +93,7 @@ public class DslLoaderUtil { String loadDslContent = getDslByFileName(fileName); if (StringUtils.isBlank(loadDslContent)) { - LOGGER.error("class=DslLoaderUtil||method=getFormatDslByFileName||errMsg=dsl file {} content is empty", + LOGGER.error("method=getFormatDslByFileName||errMsg=dsl file {} content is empty", fileName); return ""; } @@ -102,7 +102,7 @@ public class DslLoaderUtil { String dsl = trimJsonBank( String.format(loadDslContent, args)); // 如果不是线上环境,则输出dsl语句 if (!EnvUtil.isOnline()) { - LOGGER.info("class=DslLoaderUtil||method=getFormatDslByFileName||dsl={}", dsl); + LOGGER.info("method=getFormatDslByFileName||dsl={}", dsl); } return dsl; @@ -164,7 +164,7 @@ public class DslLoaderUtil { JSON.DEFAULT_PARSER_FEATURE | Feature.OrderedField.getMask()); obj = parser.parse(); } catch (Exception t) { - LOGGER.error("class=DslLoaderUtil||method=trimJsonBank||errMsg=parse json {} error. ", dsl, t); + LOGGER.error("method=trimJsonBank||errMsg=parse json {} error. ", dsl, t); } if (obj == null) { break; @@ -212,7 +212,7 @@ public class DslLoaderUtil { return StringUtils.join(lines, ""); } catch (IOException e) { - LOGGER.error("class=DslLoaderUtil||method=readDslFileInJarFile||errMsg=read file {} error. ", fileName, + LOGGER.error("method=readDslFileInJarFile||errMsg=read file {} error. ", fileName, e); return ""; @@ -221,12 +221,12 @@ public class DslLoaderUtil { inputStream.close(); } catch (IOException e) { LOGGER.error( - "class=DslLoaderUtil||method=readDslFileInJarFile||errMsg=fail to close file {} error. ", + "method=readDslFileInJarFile||errMsg=fail to close file {} error. ", fileName, e); } } } else { - LOGGER.error("class=DslLoaderUtil||method=readDslFileInJarFile||errMsg=fail to read file {} content", + LOGGER.error("method=readDslFileInJarFile||errMsg=fail to read file {} content", fileName); return ""; } diff --git a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/jmx/impl/JmxDAOImpl.java b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/jmx/impl/JmxDAOImpl.java index 77eb3252..e95d3c43 100644 --- a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/jmx/impl/JmxDAOImpl.java +++ b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/jmx/impl/JmxDAOImpl.java @@ -65,7 +65,7 @@ public class JmxDAOImpl implements JmxDAO { return object == null? null: (Long) object; } catch (Exception e) { log.error( - "class=JmxDAOImpl||method=getServerStartTime||clusterPhyId={}||jmxHost={}||jmxPort={}||jmxConfig={}||errMsg=exception!", + "method=getServerStartTime||clusterPhyId={}||jmxHost={}||jmxPort={}||jmxConfig={}||errMsg=exception!", clusterPhyId, jmxHost, jmxPort, jmxConfig, e ); } diff --git a/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/interceptor/PermissionInterceptor.java b/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/interceptor/PermissionInterceptor.java index e522d062..034eaa58 100644 --- a/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/interceptor/PermissionInterceptor.java +++ b/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/interceptor/PermissionInterceptor.java @@ -63,7 +63,7 @@ public class PermissionInterceptor implements HandlerInterceptor { classRequestMappingValue = getClassRequestMappingValue(handler); } catch (Exception e) { LOGGER.error( - "class=PermissionInterceptor||method=preHandle||uri={}||msg=parse class request-mapping failed", + "method=preHandle||uri={}||msg=parse class request-mapping failed", request.getRequestURI(), e); } diff --git a/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/AbstractAsyncCommonDispatchTask.java b/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/AbstractAsyncCommonDispatchTask.java index 5a41aadc..6f4b461a 100644 --- a/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/AbstractAsyncCommonDispatchTask.java +++ b/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/AbstractAsyncCommonDispatchTask.java @@ -31,12 +31,12 @@ public abstract class AbstractAsyncCommonDispatchTask extends AbstractClusterPhy try { TaskResult tr = this.processClusterTask(clusterPhy, triggerTimeUnitMs); if (TaskResult.SUCCESS_CODE != tr.getCode()) { - log.error("class=AbstractAsyncCommonDispatchTask||taskName={}||clusterPhyId={}||taskResult={}||msg=failed", this.taskName, clusterPhy.getId(), tr); + log.error("method=asyncProcessSubTask||taskName={}||clusterPhyId={}||taskResult={}||msg=failed", this.taskName, clusterPhy.getId(), tr); } else { - log.debug("class=AbstractAsyncCommonDispatchTask||taskName={}||clusterPhyId={}||msg=success", this.taskName, clusterPhy.getId()); + log.debug("method=asyncProcessSubTask||taskName={}||clusterPhyId={}||msg=success", this.taskName, clusterPhy.getId()); } } catch (Exception e) { - log.error("class=AbstractAsyncCommonDispatchTask||taskName={}||clusterPhyId={}||errMsg=exception", this.taskName, clusterPhy.getId(), e); + log.error("method=asyncProcessSubTask||taskName={}||clusterPhyId={}||errMsg=exception", this.taskName, clusterPhy.getId(), e); } } ); diff --git a/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/job/CommunityReassignJobTask.java b/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/job/CommunityReassignJobTask.java index 00dbd301..563aa73c 100644 --- a/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/job/CommunityReassignJobTask.java +++ b/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/job/CommunityReassignJobTask.java @@ -35,7 +35,7 @@ public class CommunityReassignJobTask extends AbstractAsyncCommonDispatchTask { // 更新任务的状态 Result rv = reassignJobService.verifyAndUpdateStatue(jobId); if (rv != null && rv.failed()) { - log.error("class=CommunityReassignJobTask||method=processSubTask||jobId={}||result={}||msg=verify and update task status failed", jobId, rv); + log.error("method=processSubTask||jobId={}||result={}||msg=verify and update task status failed", jobId, rv); } // 更新同步进度信息 diff --git a/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/AbstractAsyncMetadataDispatchTask.java b/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/AbstractAsyncMetadataDispatchTask.java index c2b8516d..4a2a9d37 100644 --- a/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/AbstractAsyncMetadataDispatchTask.java +++ b/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/AbstractAsyncMetadataDispatchTask.java @@ -32,12 +32,12 @@ public abstract class AbstractAsyncMetadataDispatchTask extends AbstractClusterP try { TaskResult tr = this.processClusterTask(clusterPhy, triggerTimeUnitMs); if (TaskResult.SUCCESS_CODE != tr.getCode()) { - log.error("class=AbstractAsyncMetadataDispatchTask||taskName={}||clusterPhyId={}||taskResult={}||msg=failed", this.taskName, clusterPhy.getId(), tr); + log.error("method=asyncProcessSubTask||taskName={}||clusterPhyId={}||taskResult={}||msg=failed", this.taskName, clusterPhy.getId(), tr); } else { - log.debug("class=AbstractAsyncMetadataDispatchTask||taskName={}||clusterPhyId={}||msg=success", this.taskName, clusterPhy.getId()); + log.debug("method=asyncProcessSubTask||taskName={}||clusterPhyId={}||msg=success", this.taskName, clusterPhy.getId()); } } catch (Exception e) { - log.error("class=AbstractAsyncMetadataDispatchTask||taskName={}||clusterPhyId={}||errMsg=exception", this.taskName, clusterPhy.getId(), e); + log.error("method=asyncProcessSubTask||taskName={}||clusterPhyId={}||errMsg=exception", this.taskName, clusterPhy.getId(), e); } } ); diff --git a/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncPartitionTask.java b/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncPartitionTask.java index c0d50e09..b1b6858b 100644 --- a/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncPartitionTask.java +++ b/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncPartitionTask.java @@ -49,7 +49,7 @@ public class SyncPartitionTask extends AbstractAsyncMetadataDispatchTask { try { partitionService.updatePartitions(clusterPhy.getId(), entry.getKey(), entry.getValue(), dbPartitionMap.getOrDefault(entry.getKey(), new ArrayList<>())); } catch (Exception e) { - log.error("class=SyncPartitionTask||method=processSubTask||clusterPhyId={}||topicName={}||errMsg=exception", clusterPhy.getId(), entry.getKey(), e); + log.error("method=processSubTask||clusterPhyId={}||topicName={}||errMsg=exception", clusterPhy.getId(), entry.getKey(), e); } } diff --git a/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metrics/AbstractAsyncMetricsDispatchTask.java b/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metrics/AbstractAsyncMetricsDispatchTask.java index 1907e279..a97822ab 100644 --- a/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metrics/AbstractAsyncMetricsDispatchTask.java +++ b/km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metrics/AbstractAsyncMetricsDispatchTask.java @@ -32,12 +32,12 @@ public abstract class AbstractAsyncMetricsDispatchTask extends AbstractClusterPh try { TaskResult tr = this.processClusterTask(clusterPhy, triggerTimeUnitMs); if (TaskResult.SUCCESS_CODE != tr.getCode()) { - log.error("class=AbstractAsyncMetricsDispatchTask||taskName={}||clusterPhyId={}||taskResult={}||msg=failed", this.taskName, clusterPhy.getId(), tr); + log.error("method=asyncProcessSubTask||taskName={}||clusterPhyId={}||taskResult={}||msg=failed", this.taskName, clusterPhy.getId(), tr); } else { - log.debug("class=AbstractAsyncMetricsDispatchTask||taskName={}||clusterPhyId={}||msg=success", this.taskName, clusterPhy.getId()); + log.debug("method=asyncProcessSubTask||taskName={}||clusterPhyId={}||msg=success", this.taskName, clusterPhy.getId()); } } catch (Exception e) { - log.error("class=AbstractAsyncMetricsDispatchTask||taskName={}||clusterPhyId={}||errMsg=exception", this.taskName, clusterPhy.getId(), e); + log.error("method=asyncProcessSubTask||taskName={}||clusterPhyId={}||errMsg=exception", this.taskName, clusterPhy.getId(), e); } } );