dns, errors: Migrate to use internal/errors #14212
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nodejs-github-bot
added
dns
starkwang
force-pushed
the
dns-internal-errors
branch
from
ebfd843 to
be61d5d
Compare
jasnell
reviewed
Jul 14, 2017
doc/api/errors.md
Outdated
| @@ -580,6 +580,10 @@ by the `assert` module. | |||
|
|
|||
| Used when attempting to perform an operation outside the bounds of a `Buffer`. | |||
|
|
|||
| <a id="ERR_CARES_FAILED"></a> | |||
There was a problem hiding this comment.
Perhaps ERR_DNS_SET_SERVERS_FAILED?
jasnell
requested changes
Jul 14, 2017
starkwang
force-pushed
the
dns-internal-errors
branch
2 times, most recently
from
1ae02d3 to
56d8131
Compare
jasnell
added
the
semver-major
|
One failure in CI looks unrelated. |
refack
approved these changes
Jul 24, 2017
lib/dns.js
Outdated
| throw new TypeError('Invalid arguments: ' + | ||
| 'hostname must be a string or falsey'); | ||
| throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'hostname', | ||
| ['string', 'falsey'], hostname); |
There was a problem hiding this comment.
new indentation rule requires aligning to the call (
#14403
lib/dns.js
Outdated
| @@ -290,13 +292,14 @@ function resolve(hostname, rrtype, callback) { | |||
| resolver = resolveMap.A; | |||
| callback = rrtype; | |||
| } else { | |||
| throw new TypeError('"rrtype" argument must be a string'); | |||
| throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'rrtype', | |||
| 'string', rrtype); | |||
lib/internal/errors.js
Outdated
| @@ -113,6 +113,10 @@ E('ERR_BUFFER_OUT_OF_BOUNDS', bufferOutOfBounds); | |||
| E('ERR_CONSOLE_WRITABLE_STREAM', | |||
| 'Console expects a writable stream instance for %s'); | |||
| E('ERR_CPU_USAGE', 'Unable to obtain cpu usage %s'); | |||
| E('ERR_DNS_SET_SERVERS_FAILED', | |||
| (err, servers) => { | |||
There was a problem hiding this comment.
probably better (err, servers) => `c-ares failed to set servers: "${err}" [${servers}]`
test/parallel/test-c-ares.js
Outdated
| // Try calling resolve with an unsupported type that's an object key | ||
| 'toString' | ||
| ].forEach((val) => { | ||
| assert.throws(() => { |
There was a problem hiding this comment.
New feature of expectsError can be used without assert.throws:
common.expectsError(
dns.resolve('www.google.com', val),
{
code: 'ERR_INVALID_OPT_VALUE',
type: TypeError,
message: `The value "${val}" is invalid for option "rrtype"`
}
);
refack
reviewed
Jul 24, 2017
doc/api/errors.md
Outdated
| @@ -591,6 +591,10 @@ Used when `Console` is instantiated without `stdout` stream or when `stdout` or | |||
|
|
|||
| Used when the native call from `process.cpuUsage` cannot be processed properly. | |||
|
|
|||
| <a id="ERR_DNS_SET_SERVERS_FAILED"></a> | |||
|
|
|||
| Used when `c-ares` failed to set the server. | |||
There was a problem hiding this comment.
Used when `c-ares` failed to set the DNS servers.
80 tasks
starkwang
force-pushed
the
dns-internal-errors
branch
from
56d8131 to
0653452
Compare
|
Pushed commit to address comments. |
|
@starkwang thank you. |
|
Landed in 9cb390d |
refack
pushed a commit
that referenced
this pull request
Jul 24, 2017
PR-URL: #14212 Refs: #11273 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Khaidi Chu <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Migrate dns errors to use internal/errors.
Ref: #11273
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
dns, errors