check for monitor server start error #1064
Merged
Conversation
This file contains hidden or 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
derekcollison
requested changes
Jul 10, 2019
server/server.go
Outdated
| srv.Serve(httpListener) | ||
| err := srv.Serve(httpListener) | ||
| if err != nil { | ||
| s.Errorf("Start %s monitor on %s error: %v", monitorProtocol, |
There was a problem hiding this comment.
Should this be s.Fatalf to match other listeners like clients?
Also maybe break out hp and make error consistent.
hp := net.JoinHostPort(opts.HTTPHost, strconv.Itoa(opts.HTTPPort))
s.Fatalf("Error starting monitoring on port: %s, %q", hp, err)There was a problem hiding this comment.
Actually, hp has been initialized above, thus we can reference it directly.
should the err be formatted with %q or %v?
andyxning
force-pushed
the
check_for_monitor_server_start_error
branch
3 times, most recently
from
e839990 to
2026d86
Compare
derekcollison
requested changes
Jul 10, 2019
server/server.go
Outdated
| @@ -1471,7 +1471,10 @@ func (s *Server) startMonitoring(secure bool) error { | |||
| s.mu.Unlock() | |||
|
|
|||
| go func() { | |||
| srv.Serve(httpListener) | |||
| err := srv.Serve(httpListener) | |||
There was a problem hiding this comment.
Just combine?
if err := srv.Serve(httpListener); err != nil {
server/server_test.go
Outdated
| @@ -1162,6 +1162,8 @@ func TestConnectErrorReports(t *testing.T) { | |||
|
|
|||
| remoteURLs := RoutesFromStr("nats://127.0.0.1:1234") | |||
|
|
|||
| s.Shutdown() | |||
There was a problem hiding this comment.
This is deferred from above, why add here? Was test failing?
There was a problem hiding this comment.
Yes, tests failed. But i have figured it out. We should only Fatalf when not in a shutdown stage.
andyxning
force-pushed
the
check_for_monitor_server_start_error
branch
from
2026d86 to
bb5ff7a
Compare
andyxning
force-pushed
the
check_for_monitor_server_start_error
branch
from
bb5ff7a to
c9221fd
Compare
|
@derekcollison Done. PTAL. |
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.
Changes proposed in this pull request:
Servereturned error./cc @nats-io/core