all template add logConfig auto

devsapp · Aug 29, 2024 · 1ac598e · 1ac598e
1 parent 08d7acf
commit 1ac598e
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 13 deletions.
diff --git a/ffmpeg-app/publish.yaml b/ffmpeg-app/publish.yaml
@@ -1,7 +1,7 @@
 Edition: 3.0.0
 Type: Project
 Name: ffmpeg-app-dipper
-Version: 0.0.1
+Version: 0.0.2
 Provider:
   - 阿里云
 Description: 基于FFmpeg的音视频处理应用, 包括获取音视频元信息、获取音视频时长、音频转换、雪碧图生成、生成 GIF、打水印等多个模块。

diff --git a/ffmpeg-app/src/s.yaml b/ffmpeg-app/src/s.yaml
@@ -18,6 +18,7 @@ resources:
       memorySize: 1024
       timeout: 900
       role: ${vars.role}
+      logConfig: auto
 
   GetMediaMeta:
     component: fc3
@@ -31,6 +32,7 @@ resources:
       memorySize: 1024
       timeout: 900
       role: ${vars.role}
+      logConfig: auto
 
   GetDuration:
     component: fc3
@@ -44,6 +46,7 @@ resources:
       memorySize: 1024
       timeout: 900
       role: ${vars.role}
+      logConfig: auto
 
   VideoGif:
     component: fc3
@@ -57,6 +60,7 @@ resources:
       memorySize: 1024
       timeout: 900
       role: ${vars.role}
+      logConfig: auto
 
   GetSprites:
     component: fc3
@@ -70,6 +74,7 @@ resources:
       memorySize: 1024
       timeout: 900
       role: ${vars.role}
+      logConfig: auto
 
   VideoWatermark:
     component: fc3
@@ -83,3 +88,4 @@ resources:
       memorySize: 1024
       timeout: 900
       role: ${vars.role}
+      logConfig: auto
diff --git a/transcode/publish.yaml b/transcode/publish.yaml
@@ -3,7 +3,7 @@ Type: Project
 Name: video-transcode-dipper
 Provider:
   - 阿里云
-Version: 0.0.1
+Version: 0.0.2
 Description: 快速部署音视频转码的应用到阿里云函数计算
 HomePage: https://github.com/devsapp/start-ffmpeg/tree/dipper/transcode
 Organization: 阿里云函数计算（FC）

diff --git a/transcode/src/s.yaml b/transcode/src/s.yaml
@@ -19,6 +19,7 @@ resources:
       internetAccess: true
       role: '{{ roleArn }}'
       code: ./code/transcode
+      logConfig: auto
       asyncInvokeConfig:
         maxAsyncEventAgeInSeconds: 18000
         maxAsyncRetryAttempts: 2
@@ -38,6 +39,7 @@ resources:
       timeout: 60
       functionName: dest-succ
       code: ./code/succ
+      logConfig: auto
 
   dest_fail:
     component: fc3
@@ -50,3 +52,4 @@ resources:
       timeout: 60
       functionName: dest-fail
       code: ./code/fail
+      logConfig: auto
diff --git a/video-flow/publish.yaml b/video-flow/publish.yaml
@@ -1,7 +1,7 @@
 Edition: 3.0.0
 Type: Project
 Name: multimedia-process-flow-dipper
-Version:  0.0.2
+Version:  0.0.3
 Provider:
   - 阿里云
 Description: 基于 FC + Serverless Workflow + OSS + NAS + FFmpeg 实现的弹性高可用、并行处理的视频转码服务
@@ -58,10 +58,10 @@ Parameters:
         - us-west-1
 
     flowName:
-      title: 工作流程名称
+      title: 音视频处理工作流程名称
       type: string
-      default: multimedia-process-flow-${default-suffix}
-      description: Serverless 工作流流程名称
+      default: multimedia-flow-${default-suffix}
+      description: 音视频处理 Serverless 工作流流程名称
 
     fnfRoleArn:
       title: 工作流 RAM角色ARN
@@ -102,6 +102,7 @@ Parameters:
       x-bucket:
         dependency:
           - region
+
     prefix:
       title: 前缀
       type: string

diff --git a/video-flow/src/code/workflows/fc-input.json b/video-flow/src/code/workflows/fc-input.json
@@ -7,6 +7,4 @@
     "mp4",
     "flv"
   ]
-}
-
-// oss-trigger-workflow 设置 oss触发器，设置前缀为 source，避免无限循环
+}
diff --git a/video-flow/src/s.yaml b/video-flow/src/s.yaml
@@ -20,6 +20,7 @@ resources:
       code: code/split
       vpcConfig: auto
       nasConfig: auto
+      logConfig: auto
 
   transcode:
     component: fc3
@@ -34,6 +35,7 @@ resources:
       code: code/transcode
       vpcConfig: ${resources.split.output.vpcConfig}
       nasConfig: ${resources.split.output.nasConfig}
+      logConfig: auto
 
   merge:
     component: fc3
@@ -48,6 +50,7 @@ resources:
       code: code/merge
       vpcConfig: ${resources.split.output.vpcConfig}
       nasConfig: ${resources.split.output.nasConfig}
+      logConfig: auto
 
   after-process:
     component: fc3
@@ -62,8 +65,9 @@ resources:
       code: code/after-process
       vpcConfig: ${resources.split.output.vpcConfig}
       nasConfig: ${resources.split.output.nasConfig}
+      logConfig: auto
 
-  oss-trigger-workflow:
+  oss-trigger-execute-flow:
     component: fc3
     props:
       region: ${vars.region}
@@ -76,9 +80,10 @@ resources:
         FLOW_NAME: ${vars.flowName}
         SEG_INTERVAL: '{{ segInterval }}'
         DST_FORMATS: '{{ dstFormats }}'
-      functionName: ${vars.flowName}_oss-trigger-workflow
+      functionName: ${vars.flowName}_trigger_execute
       role: ${vars.role}
       code: code/oss-trigger
+      logConfig: auto
       triggers:
         - triggerName: ${vars.flowName}
           triggerType: oss
@@ -94,7 +99,7 @@ resources:
           invocationRole: '{{ triggerRoleArn }}'
           sourceArn: acs:oss:${this.props.region}:${config("AccountID")}:{{ ossBucket }}
 
-  multimedia-process-v3-workflow:
+  multimedia-process-workflow:
     component: flow
     props:
       name: ${vars.flowName}

diff --git a/video-flow/src/variable.yaml b/video-flow/src/variable.yaml
@@ -1,5 +1,5 @@
 services: #服务变量
-  oss-trigger-workflow: 
+  oss-trigger-execute-flow: 
     segInterval:
       title: 对视频进行分片处理的分片时间
       type: string
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,4 @@ @@
         "mp4",
         "flv"
       ]
-    }
-    // oss-trigger-workflow 设置 oss触发器，设置前缀为 source，避免无限循环
+    }