Infrastructure/verdaccio
0
Fork 0
mirror of https://github.com/verdaccio/verdaccio.git synced 2024-12-30 22:34:10 -05:00
Code Issues Activity

fixing a next(err) function called twice

Browse source
This commit is contained in:
Alex Kocharin 2013-10-11 13:49:00 +04:00
parent 70f717a295
commit 957f915d42
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/index.js
View file

@ -35,6 +35,28 @@ module.exports = function(config_hash) {
}; };
var app = express(); var app = express();
app.use(function(req, res, next) {
var calls = 0;
res.report_error = function(err) {
calls++;
if (err.status && err.status >= 400 && err.status < 600) {
if (calls == 1) {
res.status(err.status);
res.send({error: err.msg || err.message || 'unknown error'});
}
} else {
console.log(err);
console.log(err.stack);
if (calls == 1) {
res.status(500);
res.send({error: 'internal server error'});
}
}
}
next();
});
app.use(Middleware.log_and_etagify); app.use(Middleware.log_and_etagify);
app.use(basic_auth(function(user, pass) { app.use(basic_auth(function(user, pass) {
return config.authenticate(user, pass); return config.authenticate(user, pass);
@ -100,7 +122,7 @@ module.exports = function(config_hash) {
app.get('/:package/-/:filename', can('access'), function(req, res, next) { app.get('/:package/-/:filename', can('access'), function(req, res, next) {
var stream = storage.get_tarball(req.params.package, req.params.filename); var stream = storage.get_tarball(req.params.package, req.params.filename);
stream.on('error', function(err) { stream.on('error', function(err) {
return next(err); return res.report_error(err);
}); });
res.header('content-type', 'application/octet-stream'); res.header('content-type', 'application/octet-stream');
stream.pipe(res); stream.pipe(res);
@ -223,7 +245,7 @@ module.exports = function(config_hash) {
}); });
stream.on('error', function(err) { stream.on('error', function(err) {
return next(err); return res.report_error(err);
}); });
stream.on('success', function() { stream.on('success', function() {
res.status(201); res.status(201);
@ -250,15 +272,7 @@ module.exports = function(config_hash) {
app.use(app.router); app.use(app.router);
app.use(function(err, req, res, next) { app.use(function(err, req, res, next) {
if (err.status && err.status >= 400 && err.status < 600) { res.report_error(err);
res.status(err.status);
res.send({error: err.msg || err.message || 'unknown error'});
} else {
console.log(err);
console.log(err.stack);
res.status(500);
res.send({error: 'internal server error'});
}
}); });
return app; return app;