优化日志

648540858
1 parent 88153af0
Showing 2 changed files with 12 additions and 9 deletions
src/main/java/top/panll/assist/service/FFmpegExecUtils.java
src/main/java/top/panll/assist/service/VideoFileService.java
@@ -78,6 +78,7 @@ public class FFmpegExecUtils implements InitializingBean{
  
     @Async
     public void mergeOrCutFile(List<File> fils, File dest,  String destFileName, VideoHandEndCallBack callBack){
+
         if (fils == null || fils.size() == 0 || ffmpeg == null || ffprobe == null || dest== null || !dest.exists()){
             callBack.run("error", 0.0, null);
             return;
@@ -127,15 +128,15 @@ public class FFmpegExecUtils implements InitializingBean{
             double percentage = progress.out_time_ns / duration_ns;
  
             // Print out interesting information about the progress
-            System.out.println(String.format(
-                    "[%.0f%%] status:%s frame:%d time:%s ms fps:%.0f speed:%.2fx",
-                    percentage * 100,
-                    progress.status,
-                    progress.frame,
-                    FFmpegUtils.toTimecode(progress.out_time_ns, TimeUnit.NANOSECONDS),
-                    progress.fps.doubleValue(),
-                    progress.speed
-            ));
+//            System.out.println(String.format(
+//                    "[%.0f%%] status:%s frame:%d time:%s ms fps:%.0f speed:%.2fx",
+//                    percentage * 100,
+//                    progress.status,
+//                    progress.frame,
+//                    FFmpegUtils.toTimecode(progress.out_time_ns, TimeUnit.NANOSECONDS),
+//                    progress.fps.doubleValue(),
+//                    progress.speed
+//            ));
  
             if (progress.status.equals(Progress.Status.END)){
                 callBack.run(progress.status.name(), percentage, recordFileResultPath);
@@ -338,6 +338,7 @@ public class VideoFileService {
             return null;
         }
         String taskId = DigestUtils.md5DigestAsHex(String.valueOf(System.currentTimeMillis()).getBytes());
+        logger.info("[录像合并] 开始合并，APP:{}, STREAM: {}, 任务ID：{}", app, stream, taskId);
         String destDir = "recordTemp" + File.separator + taskId + File.separator + app;
         File recordFile = new File(new File(userSettings.getRecord()).getParentFile().getAbsolutePath()  + File.separator + destDir );
         if (!recordFile.exists()) recordFile.mkdirs();
@@ -374,6 +375,7 @@ public class VideoFileService {
                     mergeOrCutTaskInfo.setPlayFile(remoteHost + "/" + relativize);
                 }
                 redisUtil.convertAndSend("topic_mergeorcut_end", mergeOrCutTaskInfo);
+                logger.info("[录像合并] 合并完成，APP:{}, STREAM: {}, 任务ID：{}", app, stream, taskId);
             }else {
                 mergeOrCutTaskInfo.setPercentage(percentage + "");
                 redisUtil.convertAndSend("topic_mergeorcut_continue",  mergeOrCutTaskInfo);