diff --git a/server/app.ts b/server/app.ts index 56095f77..66ce8373 100644 --- a/server/app.ts +++ b/server/app.ts @@ -1,9 +1,8 @@ import bodyParser from 'body-parser'; import compression from 'compression'; import cookieParser from 'cookie-parser'; -import express, {Request, Response, NextFunction, ErrorRequestHandler} from 'express'; +import express from 'express'; import fs from 'fs'; -import createHttpError, {HttpError} from 'http-errors'; import morgan from 'morgan'; import passport from 'passport'; import path from 'path'; @@ -55,36 +54,4 @@ app.get(path.join(paths.servedPath, 'overview'), (_req, res) => { res.send(html); }); -// Catch 404 and forward to error handler. -app.use((_req, _res, next) => { - const err = createHttpError('Not Found'); - err.status = 404; - next(err); -}); - -// Production error handler, no stacktrace leaked to user. -let errorRequestHandler: ErrorRequestHandler = (err: HttpError, _req: Request, res: Response, _next: NextFunction) => { - res.status(err.status || 500); - res.render('error', { - message: err.message, - error: {}, - title: 'Flood Error', - }); -}; - -// Development error handler, will print stacktrace. -if (app.get('env') === 'development') { - errorRequestHandler = (err: HttpError, _req: Request, res: Response, _next: NextFunction) => { - res.status(err.status || 500); - res.render('error', { - message: err.message, - error: err, - title: 'Flood Error', - }); - }; -} - -// Error handler. -app.use(errorRequestHandler); - export default app; diff --git a/server/bin/start.ts b/server/bin/start.ts index 3e3ac61a..96bae1cd 100755 --- a/server/bin/start.ts +++ b/server/bin/start.ts @@ -6,6 +6,8 @@ import enforcePrerequisites from './enforce-prerequisites'; import migrateData from './migrations/run'; import startWebServer from './web-server'; +process.env.NODE_ENV = process.env.NODE_ENV !== 'development' ? 'production' : 'development'; + enforcePrerequisites() .then(migrateData) .then(startWebServer)