1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util,net: move _detailedException into util

Browse Source 
This allows _detailedException() to be used by both the 'net' and
'dgram' modules to provide more informative error messages.

PR-URL: https://github.com/iojs/io.js/pull/250
Reviewed-By: Bert Belder <bertbelder@gmail.com>
This commit is contained in:
Evan Lucas 2015-01-07 18:03:24 -06:00 committed by Evan Lucas
parent 8a0e7d6566
commit 3937e8566d
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/net.js
View File

@ -38,6 +38,7 @@ var WriteWrap = process.binding('stream_wrap').WriteWrap;
var cluster; var cluster;
var errnoException = util._errnoException; var errnoException = util._errnoException;
var detailedException = util._detailedException;
function noop() {} function noop() {}
@ -68,26 +69,6 @@ function isPipeName(s) {
return util.isString(s) && toNumber(s) === false; return util.isString(s) && toNumber(s) === false;
} }
// format exceptions
function detailedException(err, syscall, address, port, additional) {
var details;
if (port && port > 0) {
details = address + ':' + port;
} else {
details = address;
}
if (additional) {
details += ' - Local (' + additional + ')';
}
var ex = errnoException(err, syscall, details);
ex.address = address;
if (port) {
ex.port = port;
}
return ex;
}
exports.createServer = function() { exports.createServer = function() {
return new Server(arguments[0], arguments[1]); return new Server(arguments[0], arguments[1]);
}; };

20
lib/util.js
View File

@ -756,3 +756,23 @@ exports._errnoException = function(err, syscall, original) {
e.syscall = syscall; e.syscall = syscall;
return e; return e;
}; };
exports._detailedException = function(err, syscall, address, port, additional) {
var details;
if (port && port > 0) {
details = address + ':' + port;
} else {
details = address;
}
if (additional) {
details += ' - Local (' + additional + ')';
}
var ex = exports._errnoException(err, syscall, details);
ex.address = address;
if (port) {
ex.port = port;
}
return ex;
};