lyhzzz 1 年之前
父節點
當前提交
9369b874af

+ 0 - 3
src/main/java/com/fdkankan/mqcontroller/task/TaskController.java

@@ -18,7 +18,6 @@ public class TaskController {
     @Scheduled(cron = "*/60 * * * * ?") // 每60秒执行一次(使用cron表达式)
     public void runTask(){
         try {
-            log.info("runTask");
             taskService.runTask();
         }catch (Exception e){
             log.info("runTask:",e);
@@ -28,7 +27,6 @@ public class TaskController {
     @Scheduled(cron = "*/20 * * * * ?") // 每20秒执行一次(使用cron表达式)
     public void openEcs(){
         try {
-            log.info("openEcs");
             taskService.openEcsList();
         }catch (Exception e){
             log.info("openEcs:",e);
@@ -38,7 +36,6 @@ public class TaskController {
     @Scheduled(cron = "*/10 * * * * ?") // 每10秒执行一次(使用cron表达式)
     public void delEcs(){
         try {
-            log.info("delEcs");
             taskService.delEcsList();
         }catch (Exception e){
             log.info("delEcs:",e);

+ 2 - 3
src/main/java/com/fdkankan/mqcontroller/task/TaskService.java

@@ -238,14 +238,14 @@ public class TaskService {
                 String key = entry.getKey();
                 LinkedBlockingQueue<DelEcsVo> openList = entry.getValue();
                 if(openList.isEmpty()){
-                    return;
+                    continue;
                 }
                 DelEcsVo take = openList.poll();
                 MqQueueConfig mqQueueConfig = queueMap.get(key);
                 List<MqSendLog> msgList = configLogsMap.get(mqQueueConfig.getId());
                 countMap.merge(mqQueueConfig.getQueueName(), 1, Integer::sum);
 
-                log.info("openEcsList--开启弹性伸缩数量:{},{}",key,openList.size());
+                log.info("openEcsList--开启弹性伸缩数量:{},{}",key,1);
                 List<MqEcs> mqEcsList = mqEcsService.getNotUpEcs();
                 log.info("openEcsList--启动中的ecs数量为:{}",mqEcsList.size());
                 if(!mqEcsList.isEmpty()){
@@ -257,7 +257,6 @@ public class TaskService {
                 if(flag){
                     mqEcsService.add(take.getQueueName());
                     sendRabbitMq(msgList,1,mqQueueConfig.getQueueName());
-                    Thread.sleep(5000L);
                 }else {
                     openList.offer(take);
                 }