amikhalev/sprinklers3
1
1
Fork 0
Code Issues 9 Pull Requests 1 Releases Wiki Activity

fix: Error handling

Browse Source
This commit is contained in:
Alex Mikhalev 2018-09-03 18:06:14 -06:00
parent a85ddae7ad
commit 4963e31473
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/ApiError.ts
View File

@ -25,6 +25,7 @@ export default class ApiError extends Error {
toJSON(development: boolean = false) { toJSON(development: boolean = false) {
return { return {
message: this.message, message: this.message,
statusCode: this.statusCode,
code: this.code, code: this.code,
data: development ? this.data : undefined data: development ? this.data : undefined
}; };

6
server/express/errorHandler.ts
View File

@ -14,13 +14,15 @@ const errorHandler: express.ErrorRequestHandler = (
if (err instanceof ApiError) { if (err instanceof ApiError) {
// TODO: different content-type? // TODO: different content-type?
res.status(err.statusCode).json(err.toJSON(isDev)); res.status(err.statusCode).json(err.toJSON(isDev));
} else { } else if (err) {
const internalError = new ApiError( const internalError = new ApiError(
"An internal server error has occurred", "An internal server error has occurred",
ErrorCode.Internal ErrorCode.Internal,
err.stack ? err.stack : err
); );
errorHandler(internalError, req, res, next); errorHandler(internalError, req, res, next);
} }
next();
}; };
export default errorHandler; export default errorHandler;