add another error to the isConnRefused check #1951
Conversation
whyrusleeping
force-pushed
the
fix/api-check-timeout
branch
2 times, most recently
from
3db3a06 to
17bce50
Compare
|
@whyrusleeping can you separate the filepath out into another commit? two totally unrelated logical changes worth having separate to be able to revert one etc. |
| return false | ||
| } | ||
|
|
||
| return netoperr.Op == "dial" |
There was a problem hiding this comment.
im not sure this one statement captures the two other errors. also no longer works with a non-url net.OpError. and if a dial fails for some other reason (like memory alloc failure or some other random happenstance) this will not discern (may be ok).
how about something like:
func isConnRefused(err error) bool {
switch e := err.(type) {
case *url.Error:
return isConnRefused(e.Err)
case *net.OpError:
return e.Op == "dial" && (further condition that e really means failure to connect here)
default:
return false
}
}There was a problem hiding this comment.
we're not going to get a netOp error from a call to http.Post though. The net.OpError is always wrapped before being returned down to us.
There was a problem hiding this comment.
then rename it isHTTPConnRefused(...) if you dont want people to use it for other net conn error checking
There was a problem hiding this comment.
Out of scope for this PR, but there are several strings.Contains err checks elsewhere in the code that should be fixed.
|
yay for path stuff. some comments abvoe |
whyrusleeping
force-pushed
the
fix/api-check-timeout
branch
from
17bce50 to
d040664
Compare
|
commits split up |
|
@whyrusleeping https://travis-ci.org/ipfs/go-ipfs/jobs/90004675#L158 looks like a rebase problem |
|
(since it's on pr) |
|
LGTM otherwise, feel free to merge once that's fixed and all tests pass |
whyrusleeping
force-pushed
the
fix/api-check-timeout
branch
from
b3c1ffa to
554f304
Compare
License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com> rewrite path to filepath in fsrepo License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com> remove api file on repo close License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com> update function to check normal net.OpErrors License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
whyrusleeping
force-pushed
the
fix/api-check-timeout
branch
from
554f304 to
a23609f
Compare
add another error to the isConnRefused check
|
fixed, squashed, and going into master. |
fixes #1950 and also makes things more likely to work on windows (decided to fix the filepath stuff while i was at it)
License: MIT
Signed-off-by: Jeromy jeromyj@gmail.com