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

dns: use template literals

Browse Source 
Prefer the use of template string literals over string concatenation
in the dns module, makes dns consistent with other modules basically
doing https://github.com/nodejs/node/pull/5778 for it.

PR-URL: https://github.com/nodejs/node/pull/5809
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Benjamin Gruenbaum 2016-03-20 15:13:51 +02:00
parent c979a2d447
commit 8baaa25aec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/dns.js
View File

@ -24,7 +24,8 @@ function errnoException(err, syscall, hostname) {
} }
var ex = null; var ex = null;
if (typeof err === 'string') { // c-ares error code. if (typeof err === 'string') { // c-ares error code.
ex = new Error(syscall + ' ' + err + (hostname ? ' ' + hostname : '')); const errHost = hostname ? ' ' + hostname : '';
ex = new Error(`${syscall} ${err}${errHost}`);
ex.code = err; ex.code = err;
ex.errno = err; ex.errno = err;
ex.syscall = syscall; ex.syscall = syscall;
@ -271,7 +272,7 @@ exports.resolve = function(hostname, type_, callback_) {
if (typeof resolver === 'function') { if (typeof resolver === 'function') {
return resolver(hostname, callback); return resolver(hostname, callback);
} else { } else {
throw new Error('Unknown type "' + type_ + '"'); throw new Error(`Unknown type "${type_}"`);
} }
}; };
@ -309,7 +310,7 @@ exports.setServers = function(servers) {
if (ver) if (ver)
return newSet.push([ver, s]); return newSet.push([ver, s]);
throw new Error('IP address is not properly formatted: ' + serv); throw new Error(`IP address is not properly formatted: ${serv}`);
}); });
var r = cares.setServers(newSet); var r = cares.setServers(newSet);
@ -319,8 +320,7 @@ exports.setServers = function(servers) {
cares.setServers(orig.join(',')); cares.setServers(orig.join(','));
var err = cares.strerror(r); var err = cares.strerror(r);
throw new Error('c-ares failed to set servers: "' + err + throw new Error(`c-ares failed to set servers: "${err}" [${servers}]`);
'" [' + servers + ']');
} }
}; };