media-isolated: fix local infinite loop bug, fix logging issues

desci-labs · Aug 15, 2024 · d7836f7 · d7836f7
1 parent 8cb41ba
commit d7836f7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/desci-media-isolated/Dockerfile b/desci-media-isolated/Dockerfile
@@ -30,7 +30,7 @@ COPY . .
 EXPOSE 9777
 
 ENTRYPOINT ["/usr/src/app/scripts/containerInitDev.sh"]
-CMD ["dumb-init", "npx", "tsx","watch", "--env-file=.env", "--inspect=0.0.0.0:9777", "src/index.ts"]
+CMD ["dumb-init", "npx", "tsx","watch", "--clear-screen=false", "--env-file=.env", "--inspect=0.0.0.0:9777", "src/index.ts"]
 
 FROM base as production
 # Cache mounts for faster builds, prod env for better express perf

diff --git a/desci-media-isolated/scripts/containerInitDev.sh b/desci-media-isolated/scripts/containerInitDev.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -ex
+
 # Check if .env file does not exist and auto generate it from .example.env
 if [ ! -f /usr/src/app/.env ]; then
   cp /usr/src/app/.env.example /usr/src/app/.env

diff --git a/desci-media-isolated/scripts/containerInitProd.sh b/desci-media-isolated/scripts/containerInitProd.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -ex
+
 # Ensure temp directories exist
 mkdir -p /usr/src/app/.temp/files /usr/src/app/.temp/thumbnails /usr/src/app/.temp/files/pdf /usr/src/app/.temp/pdf
 

diff --git a/desci-media-isolated/src/controllers/pdf/preview.ts b/desci-media-isolated/src/controllers/pdf/preview.ts
@@ -31,7 +31,6 @@ export const generatePreview = async (
   if (!pages) throw new BadRequestError('Missing pages number array in request body');
 
   try {
-    // debugger;
     console.log('start preview', cid);
     const previewPaths = await PdfManipulationService.generatePdfPreviews(cid, `${cid}.pdf`, pages, height);
     console.log('done preview', cid);
@@ -51,7 +50,6 @@ export const generatePreview = async (
       }
     }
 
-    console.log({ done: previewBuffers });
     res.setHeader('Content-Type', 'application/json');
 
     res.on('finish', async () => {

diff --git a/desci-media-isolated/src/utils/logger.ts b/desci-media-isolated/src/utils/logger.ts
@@ -20,12 +20,6 @@ const devTransport = {
 
 console.log('[Media Isolated - DIR NAME]::', __dirname, __filename, logLevel);
 
-const fileTransport = {
-  target: 'pino/file',
-  options: { destination: `${__dirname}/../log/server.log` },
-  level: 'trace',
-};
-
 export const logger = pino({
   level: logLevel,
   serializers: {
@@ -98,7 +92,7 @@ export const logger = pino({
     process.env.NODE_ENV === 'production'
       ? undefined
       : {
-          targets: [devTransport, fileTransport],
+          targets: [devTransport],
         },
   redact: {
     paths: [
@@ -135,4 +129,5 @@ function omitBuffer(array: any[]) {
 
 process.on('uncaughtException', (err) => {
   logger.fatal(err, 'uncaught exception');
+  process.exit(1);
 });
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -214,6 +214,8 @@ services:
     ports:
       - "9777:9777" # debugger
       - "7771:7771" # Uncomment if you want to test the media server from the host machine
+    environment:
+      DPID_RESOLVER_URL: http://host.docker.internal:5460
 
   grobid:
     image: lfoppiano/grobid:0.8.0