From ab34fa7113313862d8970a63a141bbd0962e712f Mon Sep 17 00:00:00 2001
From: wangwei <305939031@qq.com>
Date: Fri, 13 Oct 2023 14:20:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E6=B5=81=E4=B8=8D=E7=A8=B3=E5=AE=9A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bluesbruce/ffch/CommandManagerImpl.java   |  2 +-
 .../spring/service/RtmpLiveService.java       | 27 ++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/bluesbruce/ffch/CommandManagerImpl.java b/src/main/java/com/github/bluesbruce/ffch/CommandManagerImpl.java
index 914cfa0..ec2769e 100644
--- a/src/main/java/com/github/bluesbruce/ffch/CommandManagerImpl.java
+++ b/src/main/java/com/github/bluesbruce/ffch/CommandManagerImpl.java
@@ -249,7 +249,7 @@ public class CommandManagerImpl implements CommandManager {
 			}
 		}
 		if (config.isDebug())
-			log.info("停止了" + index + "个任务！");
+			log.info("停止了" + index + "个任务！名称：{}",index>0?tasker.getId():"null");
 		return index;
 	}
 
diff --git a/src/main/java/com/github/bluesbruce/spring/service/RtmpLiveService.java b/src/main/java/com/github/bluesbruce/spring/service/RtmpLiveService.java
index 626d2c8..9d804f7 100644
--- a/src/main/java/com/github/bluesbruce/spring/service/RtmpLiveService.java
+++ b/src/main/java/com/github/bluesbruce/spring/service/RtmpLiveService.java
@@ -338,10 +338,32 @@ public class RtmpLiveService {
                 oldMsg=map1.get("oldMsg")==null?"":map1.get("oldMsg").toString();
                 oldtime=Long.parseLong(map1.get("oldtime")==null?"0":map1.get("oldtime").toString());
             }
-            if (status==0){
+            if (status==0&&manager.queryAll().size()>0){
+                log.info("停止推流20");
+                if (manager.queryAll().size()>0){
+                    manager.stopAll();
+                    manager.destory();
+                }
+                Thread.sleep(5000);
+                if (manager.queryAll().size()>0){
+                    log.info("延迟检测推流1");
+                    manager.stopAll();
+                    manager.destory();
+                }
+                log.info("无任务，停止监听1");
                 break;
             }
-            Thread.sleep(200);
+            if (status==0&&manager.queryAll().size()==0){
+                log.info("无任务，停止监听2");
+                Thread.sleep(5000);
+                if (manager.queryAll().size()>0){
+                    log.info("延迟检测推流关闭");
+                    manager.stopAll();
+                    manager.destory();
+                }
+                break;
+            }
+            Thread.sleep(400);
         }
     }
 
@@ -368,7 +390,6 @@ public class RtmpLiveService {
                         log.info("推流失败，重新推流");
                     }
                 }
-
         }
         Map map = new HashMap();
         map.put("oldtime",oldtime);