TheThing
/
koa-lite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #288 from dead-horse/issue287 

asset non-error obj in app.onerror, fixed #287
master
TJ Holowaychuk 2014-06-05 16:35:17 -07:00
parent 851160e0ae 4979077562
commit f68716d8b4
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/application.js
View File

@ -155,10 +155,15 @@ app.createContext = function(req, res){
*/
app.onerror = function(err){
if (!err) return;
assert(err instanceof Error, 'non-error thrown: ' + err);
if (404 == err.status) return;
if ('test' == this.env) return;
var msg = err.stack || err.toString();
console.error();
console.error(err.stack.replace(/^/gm, ' '));
console.error(msg.replace(/^/gm, ' '));
console.error();
};

7
lib/context.js
View File

@ -91,18 +91,17 @@ var proto = module.exports = {
assert(err instanceof Error, 'non-error thrown: ' + err);
// delegate
this.app.emit('error', err, this);
// nothing we can do here other
// than delegate to the app-level
// handler and log.
if (this.headerSent || !this.writable) {
err.headerSent = true;
this.app.emit('error', err, this);
return;
}
// delegate
this.app.emit('error', err, this);
// unset all headers
this.res._headers = {};