Merge branch 'master' of https://github.com/Zibbp/Ceres

pull
Zibbp · Feb 5, 2022 · 3952654 · 3952654
2 parents 33a1970 + 8a96a40
commit 3952654
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -21,7 +21,7 @@ RUN apk update \
 
 WORKDIR /tmp
 
-COPY ./.github/Inter.otf ./
+COPY ./Inter.otf ./
 
 RUN mkdir -p /usr/share/fonts/opentype/
 

diff --git a/.github/Inter.otf → Inter.otf b/.github/Inter.otf → Inter.otf
diff --git a/LICENSE b/LICENSE
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/nginx.conf b/nginx.conf
diff --git a/src/exec/exec.service.ts b/src/exec/exec.service.ts
@@ -58,6 +58,10 @@ export class ExecService {
       this.logger.verbose(`Video download ${vodInfo['id']} stdout: ${data}`);
       videoDownloadLog.write(data);
     });
+    downloadVideoChild.stderr.on('data', (data) => {
+      this.logger.verbose(`Video download ${vodInfo['id']} stderr: ${data}`);
+      videoDownloadLog.write(data);
+    });
 
     downloadVideoChild.on('error', (error) => {
       this.logger.error(