feat: log docker info from compose #591
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
mdelapenya
commented
Oct 27, 2022
| if err != nil { | ||
| p.Logger.Printf("failed getting information about docker server: %s", err) | ||
| logger.Printf("failed getting information about docker server: %s", err) | ||
| return |
There was a problem hiding this comment.
I noticed this if was incomplete, as it should exit the function.
I wonder if we should raise an error here, as if the docker info failed, then we cannot continue. In the meantime, we can live with the return, as this function is called after the docker client creation, so it's expected using the client is healthy
mdelapenya
changed the title
kiview
approved these changes
Oct 28, 2022
| @@ -22,6 +23,7 @@ const ( | |||
| envComposeFile = "COMPOSE_FILE" | |||
| ) | |||
|
|
|||
| var composeLogOnce sync.Once | |||
mdelapenya
added
feature
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.
What is this PR doing?
This PR extracts the function to log the docker info command from the provider to a helper method, so that it can be reused when creating a compose instance.
This new func recieves a Go context, a Docker client and the logger to be used
Finally, I noticed the existing logServerInfo function was incorrect in the flow: if an error occurred while getting the Info, the code did not exit the function, continuing with a wrong and empty message.
Why is it important?
We added the log info for the generic containers, but did not add it to the compose ones. After #476, now it's possible to spin up native compose containers from Go, without shelling out to the local binary, and this log was missing (the log was added way later than this PR was born)
Related issues
Follow ups
As part of #549, where we want to initialise resources once, we could improve the architectural design to have a single docker client for both container types (compose and generic), therefore we could simply log the server info in one single place, not in two as we have now.