|
@@ -6,7 +6,7 @@ var cookieParser = require('cookie-parser');
|
|
var bodyParser = require('body-parser');
|
|
var bodyParser = require('body-parser');
|
|
|
|
|
|
var routes = require('./routes/index');
|
|
var routes = require('./routes/index');
|
|
-var avatars = require('./routes/avatars')
|
|
|
|
|
|
+var avatars = require('./routes/avatars');
|
|
|
|
|
|
var app = express();
|
|
var app = express();
|
|
|
|
|
|
@@ -23,13 +23,13 @@ app.use(cookieParser());
|
|
app.use(express.static(path.join(__dirname, 'public')));
|
|
app.use(express.static(path.join(__dirname, 'public')));
|
|
|
|
|
|
app.use('/', routes);
|
|
app.use('/', routes);
|
|
-app.use('/avatars', avatars)
|
|
|
|
|
|
+app.use('/avatars', avatars);
|
|
|
|
|
|
// catch 404 and forward to error handler
|
|
// catch 404 and forward to error handler
|
|
app.use(function(req, res, next) {
|
|
app.use(function(req, res, next) {
|
|
- var err = new Error('Not Found');
|
|
|
|
- err.status = 404;
|
|
|
|
- next(err);
|
|
|
|
|
|
+ var err = new Error('Not Found');
|
|
|
|
+ err.status = 404;
|
|
|
|
+ next(err);
|
|
});
|
|
});
|
|
|
|
|
|
// error handlers
|
|
// error handlers
|
|
@@ -37,23 +37,23 @@ app.use(function(req, res, next) {
|
|
// development error handler
|
|
// development error handler
|
|
// will print stacktrace
|
|
// will print stacktrace
|
|
if (app.get('env') === 'development') {
|
|
if (app.get('env') === 'development') {
|
|
- app.use(function(err, req, res, next) {
|
|
|
|
- res.status(err.status || 500);
|
|
|
|
- res.render('error', {
|
|
|
|
- message: err.message,
|
|
|
|
- error: err
|
|
|
|
- });
|
|
|
|
|
|
+ app.use(function(err, req, res, next) {
|
|
|
|
+ res.status(err.status || 500);
|
|
|
|
+ res.render('error', {
|
|
|
|
+ message: err.message,
|
|
|
|
+ error: err
|
|
});
|
|
});
|
|
|
|
+ });
|
|
}
|
|
}
|
|
|
|
|
|
// production error handler
|
|
// production error handler
|
|
// no stacktraces leaked to user
|
|
// no stacktraces leaked to user
|
|
app.use(function(err, req, res, next) {
|
|
app.use(function(err, req, res, next) {
|
|
- res.status(err.status || 500);
|
|
|
|
- res.render('error', {
|
|
|
|
- message: err.message,
|
|
|
|
- error: {}
|
|
|
|
- });
|
|
|
|
|
|
+ res.status(err.status || 500);
|
|
|
|
+ res.render('error', {
|
|
|
|
+ message: err.message,
|
|
|
|
+ error: {}
|
|
|
|
+ });
|
|
});
|
|
});
|
|
|
|
|
|
module.exports = app;
|
|
module.exports = app;
|