github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-25 06:31:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #511 from sharelatex/bg-handle-web-api-errors

Browse source 
use a separate error handler for api router errors
This commit is contained in:
Brian Gough 2017-06-06 09:22:28 +01:00 committed by GitHub
commit b277ee3254
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/web/app/coffee/Features/Errors/ErrorController.coffee
View file

@ -32,3 +32,11 @@ module.exports = ErrorController =
else else
logger.error err: error, url:req.url, method:req.method, user:user, "error passed to top level next middlewear" logger.error err: error, url:req.url, method:req.method, user:user, "error passed to top level next middlewear"
ErrorController.serverError req, res ErrorController.serverError req, res
handleApiError: (error, req, res, next) ->
if error instanceof Errors.NotFoundError
logger.warn {err: error, url: req.url}, "not found error"
res.sendStatus(404)
else
logger.error err: error, url:req.url, method:req.method, user:user, "error passed to top level next middlewear"
res.sendStatus(500)

3
services/web/app/coffee/infrastructure/Server.coffee
View file

@ -164,11 +164,12 @@ server = require('http').createServer(app)
# process api routes first, if nothing matched fall though and use # process api routes first, if nothing matched fall though and use
# web middlewear + routes # web middlewear + routes
app.use(apiRouter) app.use(apiRouter)
app.use(ErrorController.handleApiError)
app.use(webRouter) app.use(webRouter)
app.use(ErrorController.handleError)
router = new Router(webRouter, apiRouter) router = new Router(webRouter, apiRouter)
app.use ErrorController.handleError
module.exports = module.exports =
app: app app: app