Skip to content

Commit

Permalink
Merge pull request #1796 from paneidos/raise-500-on-python-error
Browse files Browse the repository at this point in the history
fix: return 500 Internal Server Error on python error
  • Loading branch information
dherault committed Aug 30, 2024
1 parent cfd65da commit 2a2db11
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 7 deletions.
13 changes: 8 additions & 5 deletions src/events/http/HttpServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ export default class HttpServer {
/* RESPONSE SELECTION (among endpoint's possible responses) */

// Failure handling
let errorStatusCode = "502"
let errorStatusCode = "500"

if (err) {
const errorMessage = (err.message || err).toString()
Expand All @@ -655,14 +655,17 @@ export default class HttpServer {
if (found && found.length > 1) {
;[, errorStatusCode] = found
} else {
errorStatusCode = "502"
errorStatusCode = "500"
}

// Mocks Lambda errors
result = {
errorMessage,
errorType: err.constructor.name,
stackTrace: this.#getArrayStackTrace(err.stack),
body: JSON.stringify({
message: errorMessage,
stackTrace: this.#getArrayStackTrace(err.stack),
type: err.constructor.name,
}),
statusCode: errorStatusCode,
}

log.error(errorMessage)
Expand Down
4 changes: 2 additions & 2 deletions src/lambda/handler-runner/python-runner/PythonRunner.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ export default class PythonRunner {
})

const onErr = (data) => {
// TODO

log.notice(data.toString())

rej(new Error("Internal Server Error"))
}

const onLine = (line) => {
Expand Down
3 changes: 3 additions & 0 deletions tests/runtimes/python/python3/handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ def hello(event, context):
"body": json.dumps(body),
"statusCode": 200,
}

def error(event, context):
raise Exception("This is an error")
9 changes: 9 additions & 0 deletions tests/runtimes/python/python3/python3.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,13 @@ describe("Python 3 tests", function desc() {
assert.deepEqual(json, expected)
})
})

it("should return a 500 on error", async () => {
const url = new URL("/dev/error", BASE_URL)
const response = await fetch(url)
const json = await response.json()

assert.equal(response.status, 500)
assert.equal(json.message, "Internal Server Error")
})
})
6 changes: 6 additions & 0 deletions tests/runtimes/python/python3/serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ functions:
method: get
path: hello
handler: handler.hello
error:
events:
- http:
method: get
path: error
handler: handler.error

0 comments on commit 2a2db11

Please sign in to comment.