From c9d913929e5cd3764b354e085efe381d6d3897fb Mon Sep 17 00:00:00 2001
From: chenlei <poison7@yeah.net>
Date: Tue, 30 Jul 2019 12:21:53 +0800
Subject: [PATCH] =?UTF-8?q?1,=20=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/Dockerfile          | 2 +-
 server/main.cpp            | 2 +-
 src/MediaFile/Mp4Maker.cpp | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 91924b30..b10c3c7a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 #################################################################
-# 在项目根目录执行 docker build -t cl-zlmedia -f ./docker/Dockerfile .
+# 在项目根目录执行 docker build -t nexus.docker.kefen.site:7300/kefen/cl-zlmedia -f ./docker/Dockerfile .
 #################################################################
 
 #基础
diff --git a/server/main.cpp b/server/main.cpp
index 5a06a465..84c5eb8f 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -222,7 +222,7 @@ void initEventListener() {
                 bool vOnDemand = tProxyData.get("on_demand",true).asBool();
                 bool realOnDemand = vRecordMp4 ? false : vOnDemand;
                 if(!realOnDemand){
-                    InfoL << "频道保持录像,忽略停止拉流:" << sender.getSchema() << "/" << sender.getVhost() << "/" << sender.getApp() << "/" << sender.getId();
+                    //InfoL << "频道保持录像,忽略停止拉流:" << sender.getSchema() << "/" << sender.getVhost() << "/" << sender.getApp() << "/" << sender.getId();
                     return;
                 }
             }
diff --git a/src/MediaFile/Mp4Maker.cpp b/src/MediaFile/Mp4Maker.cpp
index 293be0b1..6a6802e6 100644
--- a/src/MediaFile/Mp4Maker.cpp
+++ b/src/MediaFile/Mp4Maker.cpp
@@ -271,12 +271,17 @@ void Mp4Maker::asyncClose() {
     auto recordMp4 = _recordMp4;
 	WorkThreadPool::Instance().getExecutor()->async([hMp4,strFileTmp,strFile,strPath,recordMp4,info]() {
 		//获取文件录制时间，放在MP4Close之前是为了忽略MP4Close执行时间
+        InfoL << "获取文件录制时间";
 		const_cast<Mp4Info&>(info).ui64TimeLen = ::time(NULL) - info.ui64StartedTime;
 		//MP4Close非常耗时，所以要放在后台线程执行
+        InfoL << "台线程执行MP4Close";
 		MP4Close(hMp4,MP4_CLOSE_DO_NOT_COMPUTE_BITRATE);
+
+        InfoL << "临时文件名改成正式文件名，防止mp4未完成时被访问: rename " << strFileTmp.data() << ">" << strFile.data();
 		//临时文件名改成正式文件名，防止mp4未完成时被访问
 		rename(strFileTmp.data(),strFile.data());
 
+        InfoL << "删除过期录像";
 		//chenxiaolei 删除过期录像
         if(recordMp4){
             auto curTimeStr = timeStr("%Y%m%d");
@@ -319,6 +324,7 @@ void Mp4Maker::asyncClose() {
 
 
 		//chenxiaolei 生成录像文件的信息文件(记录录像时长,开始时间,持续时长等)
+        InfoL << "生成录像文件的信息文件";
         Json::Value infoJson;
         infoJson["startAt"] = timeStr2(info.ui64StartedTime,"%Y%m%d%H%M%S");
         infoJson["duration"] = (int)(info.ui64TimeLen) ;
@@ -330,7 +336,7 @@ void Mp4Maker::asyncClose() {
         Json::StyledWriter sw;
         os << sw.write(infoJson);
         os.close();
-
+        InfoL << "emitEvent kBroadcastRecordMP4";
 		/////record 业务逻辑//////
 		NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastRecordMP4,info);
 	});