Hook up mgo logging and reconnect properly. #110
Merged
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
0201aa3 to
90e4095
Compare
mjs
approved these changes
Sep 16, 2016
| @@ -422,7 +423,16 @@ func MgoTestPackage(t *testing.T, certs *Certs) { | |||
| gc.TestingT(t) | |||
| } | |||
|
|
|||
| // Output implements the mgo log_Logger interface. | |||
| func (s *MgoSuite) Output(calldepth int, message string) error { | |||
There was a problem hiding this comment.
I don't mind too much, but this doesn't really belong on the suite. A simpler wrapper type would be cleaner. The logger wouldn't even have to be added as a field on MgoSuite...
| foundAddress := false | ||
| for _, addr := range s.Session.LiveServers() { | ||
| if addr == MgoServer.Addr() { | ||
| foundAddress = true |
| @@ -758,6 +770,7 @@ func (inst *MgoInstance) EnsureRunning() error { | |||
| // If the server has already been destroyed for testing purposes, | |||
| // just start it again. | |||
| if inst.Addr() == "" { | |||
| logger.Infof("restarting mongo instance") | |||
90e4095 to
fad98e2
Compare
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju-testing |
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.
Now the mgo logging is output through loggo to the "mgo" logger.
This means it is now available to be shown, but not shown by default.
To enable in other tests, they can (after logging is set up) set:
loggo.GetLogger("mgo").SetLogLevel(loggo.TRACE)
Also, when the mongo server is changed by either restarting, or other tests killing it, the teardown now reconnects the session, which avoids some of the "no reachable servers" errors we were seeing.