fix: Lambda timeout status code (#1620)

dherault · Dec 6, 2022 · 56d986b · 56d986b
1 parent 55101d3
commit 56d986b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/events/alb/HttpServer.js b/src/events/alb/HttpServer.js
@@ -247,12 +247,10 @@ export default class HttpServer {
 
       let statusCode = 200
 
-      if (err) {
-        statusCode = errorStatusCode
-      }
-
       if (result && !result.errorType) {
         statusCode = result.statusCode || 200
+      } else if (err) {
+        statusCode = errorStatusCode || 502
       } else {
         statusCode = 502
       }

diff --git a/src/events/http/HttpServer.js b/src/events/http/HttpServer.js
@@ -828,6 +828,8 @@ export default class HttpServer {
 
         if (result && !result.errorType) {
           statusCode = result.statusCode || 200
+        } else if (err) {
+          statusCode = errorStatusCode || 502
         } else {
           statusCode = 502
         }

diff --git a/src/lambda/LambdaFunction.js b/src/lambda/LambdaFunction.js
@@ -280,7 +280,7 @@ export default class LambdaFunction {
   async #timeoutAndTerminate() {
     await setTimeoutPromise(this.#timeout)
 
-    throw new LambdaTimeoutError('Lambda timeout.')
+    throw new LambdaTimeoutError('[504] - Lambda timeout.')
   }
 
   async runHandler() {