调整Task模块日志及Api请求统计日志的输出

Author: zengqiao

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/LogConstant.java

@@ -72,16 +72,15 @@ void init() {
         LOGGER.info("init custom scheduled finished, scheduledName:{} scheduledCron:{}.", scheduledName, scheduledCron);
     }
 
-    private boolean checkAndModifyCron(String scheduledName, String scheduledCron, boolean existIfIllegal) {
+    private boolean checkAndModifyCron(String scheduledName, String scheduledCron, boolean isInit) {
         if (scheduledCron.matches(ScheduledTaskConstant.CRON_REG_EX)) {
             this.scheduledCron = scheduledCron;
-            LOGGER.info("modify scheduledCron success, scheduledName:{} scheduledCron:{}."
-                    , scheduledName, scheduledCron);
+            LOGGER.info("{} scheduledCron success, scheduledName:{} scheduledCron:{}.", isInit? "init": "modify", scheduledName, scheduledCron);
             return true;
         }
 
         LOGGER.error("modify scheduledCron failed, format invalid, scheduledName:{} scheduledCron:{}.", scheduledName, scheduledCron);
-        if (existIfIllegal) {
+        if (isInit) {
             throw new UnsupportedOperationException(String.format("scheduledName:%s scheduledCron:%s format invalid", scheduledName, scheduledCron));
         }
         return false;
@@ -128,7 +127,8 @@ public void scheduleFunction() {
             LOGGER.info("customScheduled task finished, empty selected task, scheduledName:{}.", scheduledName);
             return;
         }
-        LOGGER.info("customScheduled task running, selected tasks, IP:{} selectedTasks:{}.",
+
+        LOGGER.debug("customScheduled task running, selected tasks, IP:{} selectedTasks:{}.",
                 NetUtils.localIp(), JsonUtils.toJSONString(selectTasks)
         );
 

kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/component/AbstractScheduledTask.java

@@ -1,6 +1,5 @@
 package com.xiaojukeji.kafka.manager.task.component;
 
-import com.xiaojukeji.kafka.manager.common.constant.LogConstant;
 import com.xiaojukeji.kafka.manager.common.utils.NetUtils;
 import com.xiaojukeji.kafka.manager.dao.HeartbeatDao;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.HeartbeatDO;
@@ -18,7 +17,7 @@
  */
 @Component
 public class Heartbeat {
-    private final static Logger LOGGER = LoggerFactory.getLogger(LogConstant.SCHEDULED_TASK_LOGGER);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Heartbeat.class);
 
     @Autowired
     private HeartbeatDao heartbeatDao;

kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/component/Heartbeat.java

@@ -1,8 +1,6 @@
 package com.xiaojukeji.kafka.manager.task.dispatch.biz;
 
-
 import com.xiaojukeji.kafka.manager.common.constant.Constant;
-import com.xiaojukeji.kafka.manager.common.constant.LogConstant;
 import com.xiaojukeji.kafka.manager.task.config.TopicBillConfig;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.gateway.AppDO;
 import com.xiaojukeji.kafka.manager.common.utils.DateUtils;
@@ -30,7 +28,7 @@
  */
 @CustomScheduled(name = "calKafkaBill", cron = "0 0 1 * * *", threadNum = 1)
 public class CalKafkaTopicBill extends AbstractScheduledTask<ClusterDO> {
-    private final static Logger LOGGER = LoggerFactory.getLogger(LogConstant.SCHEDULED_TASK_LOGGER);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CalKafkaTopicBill.class);
 
     @Autowired
     private AppService appService;

kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/biz/CalKafkaTopicBill.java

@@ -1,7 +1,6 @@
 package com.xiaojukeji.kafka.manager.task.dispatch.biz;
 
 import com.xiaojukeji.kafka.manager.common.bizenum.OffsetPosEnum;
-import com.xiaojukeji.kafka.manager.common.constant.LogConstant;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.ClusterDO;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.TopicStatisticsDO;
 import com.xiaojukeji.kafka.manager.common.utils.DateUtils;
@@ -30,7 +29,7 @@
  */
 @CustomScheduled(name = "calTopicStatistics", cron = "0 0 0/4 * * ?", threadNum = 5)
 public class CalTopicStatistics extends AbstractScheduledTask<ClusterDO> {
-    private final static Logger LOGGER = LoggerFactory.getLogger(LogConstant.SCHEDULED_TASK_LOGGER);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CalTopicStatistics.class);
 
     @Autowired
     private ClusterService clusterService;

kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/biz/CalTopicStatistics.java

@@ -1,7 +1,6 @@
 package com.xiaojukeji.kafka.manager.task.dispatch.biz;
 
 import com.xiaojukeji.kafka.manager.common.bizenum.DBStatusEnum;
-import com.xiaojukeji.kafka.manager.common.constant.LogConstant;
 import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
 import com.xiaojukeji.kafka.manager.common.zookeeper.znode.brokers.BrokerMetadata;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.BrokerDO;
@@ -27,7 +26,7 @@
  */
 @CustomScheduled(name = "flushBrokerTable", cron = "0 0 0/1 * * ?", threadNum = 1)
 public class FlushBrokerTable extends AbstractScheduledTask<ClusterDO> {
-    private final static Logger LOGGER = LoggerFactory.getLogger(LogConstant.SCHEDULED_TASK_LOGGER);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FlushBrokerTable.class);
 
     @Autowired
     private BrokerService brokerService;

kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/biz/FlushBrokerTable.java

@@ -1,7 +1,6 @@
 package com.xiaojukeji.kafka.manager.task.dispatch.biz;
 
 import com.xiaojukeji.kafka.manager.common.constant.Constant;
-import com.xiaojukeji.kafka.manager.common.constant.LogConstant;
 import com.xiaojukeji.kafka.manager.common.entity.metrics.TopicMetrics;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.ClusterDO;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.TopicExpiredDO;
@@ -32,7 +31,7 @@
  */
 @CustomScheduled(name = "flushExpiredTopic", cron = "0 0 0/5 * * ?", threadNum = 1)
 public class FlushExpiredTopic extends AbstractScheduledTask<ClusterDO> {
-    private final static Logger LOGGER = LoggerFactory.getLogger(LogConstant.SCHEDULED_TASK_LOGGER);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FlushExpiredTopic.class);
 
     @Autowired
     private TopicExpiredDao topicExpiredDao;

kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/biz/FlushExpiredTopic.java

@@ -1,6 +1,5 @@
 package com.xiaojukeji.kafka.manager.task.dispatch.biz;
 
-import com.xiaojukeji.kafka.manager.common.constant.LogConstant;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.ClusterTaskDO;
 import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
 import com.xiaojukeji.kafka.manager.kcm.ClusterTaskService;
@@ -23,7 +22,7 @@
 @CustomScheduled(name = "syncClusterTaskState", cron = "0 0/1 * * * ?", threadNum = 1)
 @ConditionalOnProperty(prefix = "kcm", name = "enabled", havingValue = "true", matchIfMissing = true)
 public class SyncClusterTaskState extends AbstractScheduledTask<EmptyEntry> {
-    private final static Logger LOGGER = LoggerFactory.getLogger(LogConstant.SCHEDULED_TASK_LOGGER);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SyncClusterTaskState.class);
 
     @Autowired
     private ClusterTaskService clusterTaskService;

kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/biz/SyncClusterTaskState.java

@@ -1,7 +1,6 @@
 package com.xiaojukeji.kafka.manager.task.dispatch.metrics.collect;
 
 import com.xiaojukeji.kafka.manager.common.bizenum.OffsetPosEnum;
-import com.xiaojukeji.kafka.manager.common.constant.LogConstant;
 import com.xiaojukeji.kafka.manager.common.entity.ao.consumer.ConsumerGroup;
 import com.xiaojukeji.kafka.manager.common.entity.metrics.ConsumerMetrics;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.ClusterDO;
@@ -33,7 +32,7 @@
  */
 @CustomScheduled(name = "newCollectAndPublishCGData", cron = "30 0/1 * * * *", threadNum = 10)
 public class CollectAndPublishCGData extends AbstractScheduledTask<ClusterDO> {
-    private final static Logger LOGGER = LoggerFactory.getLogger(LogConstant.SCHEDULED_TASK_LOGGER);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CollectAndPublishCGData.class);
 
     @Autowired
     private TopicService topicService;

kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/metrics/collect/CollectAndPublishCGData.java

@@ -1,6 +1,5 @@
 package com.xiaojukeji.kafka.manager.task.dispatch.metrics.delete;
 
-import com.xiaojukeji.kafka.manager.common.constant.LogConstant;
 import com.xiaojukeji.kafka.manager.common.utils.BackoffUtils;
 import com.xiaojukeji.kafka.manager.dao.*;
 import com.xiaojukeji.kafka.manager.task.component.AbstractScheduledTask;
@@ -22,7 +21,7 @@
  */
 @CustomScheduled(name = "deleteMetrics", cron = "0 0/2 * * * ?", threadNum = 1)
 public class DeleteMetrics extends AbstractScheduledTask<EmptyEntry> {
-    private static final Logger LOGGER = LoggerFactory.getLogger(LogConstant.SCHEDULED_TASK_LOGGER);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DeleteMetrics.class);
 
     @Autowired
     private TopicMetricsDao             topicMetricsDao;