Skip to content

Commit

Permalink
feat: log docker info from compose (#591)
Browse files Browse the repository at this point in the history
* chore: log docker info from compose

* chore: use one file

* fix: exit log function on errors
  • Loading branch information
mdelapenya committed Oct 28, 2022
1 parent cba1e94 commit ab2f0be
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
7 changes: 7 additions & 0 deletions compose.go
Expand Up @@ -6,6 +6,7 @@ import (
"path/filepath"
"runtime"
"strings"
"sync"

"github.com/compose-spec/compose-go/types"
"github.com/docker/cli/cli/command"
Expand All @@ -22,6 +23,7 @@ const (
envComposeFile = "COMPOSE_FILE"
)

var composeLogOnce sync.Once
var ErrNoStackConfigured = errors.New("no stack files configured")

type composeStackOptions struct {
Expand Down Expand Up @@ -129,6 +131,11 @@ func NewDockerComposeWith(opts ...ComposeStackOption) (*dockerCompose, error) {
containers: make(map[string]*DockerContainer),
}

// log docker server info only once
composeLogOnce.Do(func() {
logDockerServerInfo(context.Background(), dockerCli.Client(), Logger)
})

return composeAPI, nil
}

Expand Down
15 changes: 9 additions & 6 deletions docker.go
Expand Up @@ -804,26 +804,29 @@ func NewDockerProvider(provOpts ...DockerProviderOption) (*DockerProvider, error
}

// log docker server info only once
logOnce.Do(p.logDockerServerInfo)
logOnce.Do(func() {
logDockerServerInfo(context.Background(), p.client, p.Logger)
})

return p, nil
}

func (p *DockerProvider) logDockerServerInfo() {
func logDockerServerInfo(ctx context.Context, client client.APIClient, logger Logging) {
infoMessage := `%v - Connected to docker:
Server Version: %v
API Version: %v
Operating System: %v
Total Memory: %v MB
`

info, err := p.client.Info(context.Background())
info, err := client.Info(ctx)
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
}

p.Logger.Printf(infoMessage, packagePath,
info.ServerVersion, p.client.ClientVersion(),
logger.Printf(infoMessage, packagePath,
info.ServerVersion, client.ClientVersion(),
info.OperatingSystem, info.MemTotal/1024/1024)
}

Expand Down

0 comments on commit ab2f0be

Please sign in to comment.