Merge branch 'main' into feat/test-case

Signed-off-by: Juan Ignacio Molteni <[email protected]>
decentraland · Feb 29, 2024 · af9bbe6 · af9bbe6
2 parents e1aafad + fb15e7a
commit af9bbe6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -86,6 +86,7 @@ COPY --from=dotnet-build /build/publish/ .
 
 WORKDIR /app
 
+COPY RoadCoordinates.json ./
 COPY ./pixyzsdk-29022024.lic ./pixyzsdk-29022024.lic
 COPY --from=scene-lod-build /scene-lod/dist ./scene-lod/dist
 COPY --from=scene-lod-build /scene-lod/package.json ./scene-lod/package.json

diff --git a/consumer-server/src/logic/lod-generator.ts b/consumer-server/src/logic/lod-generator.ts
@@ -23,13 +23,22 @@ export function createLodGeneratorComponent(): LodGeneratorComponent {
       outputPath: processOutput
     }
 
+
     const commandToExecute = `${lodGeneratorProgram} "coords" "${basePointer}" "${outputPath}" "${sceneLodEntitiesManifestBuilder}" "false" "false"`
+
     result = await new Promise((resolve, _) => {
-      exec(commandToExecute, (error, _, stderr) => {
-        if (error || stderr) {
-          result.error = {
-            message: error?.message || 'Unexpected error',
-            detailedError: ((stderr as string) || '').replace('\n', ' ')
+      exec(commandToExecute, { timeout: 10 * 60 * 1000 }, (error, _, stderr) => {
+        if (error) {
+          if (error.killed) { 
+            result.error = {
+              message: 'Operation timed out after 10 minutes',
+              detailedError: ((stderr as string) || '').replace('\n', ' ')
+            }
+          } else {
+            result.error = {
+              message: error?.message || 'Unexpected error',
+              detailedError: ((stderr as string) || '').replace('\n', ' ')
+            }
           }
         }
 

diff --git a/consumer-server/src/logic/message-handler.ts b/consumer-server/src/logic/message-handler.ts
@@ -26,7 +26,10 @@ export function createMessageHandlerComponent({
       base,
       generatedFiles: result.lodsFiles.map((file) => file.split('/').pop()).join(', ')
     })
-    logger.debug('LOD generation log', { logFile: fs.readFileSync(result.logFile, 'utf-8') })
+
+    if (result.logFile) {
+      logger.debug('LOD generation log', { logFile: fs.readFileSync(result.logFile, 'utf-8') })
+    }
 
     if (result.error) {
       logger.error('Error while generating LODs', { error: result.error.message || 'Unexpected failure' })