Skip to content

Use logrus instead of direct output to stderr#11996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndeloof merged 1 commit into from
Sep 11, 2024
Merged

Use logrus instead of direct output to stderr #11996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/compose/build_classic.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,8 @@ import (
"github.com/docker/docker/pkg/streamformatter"

"github.com/docker/compose/v2/pkg/api"

"github.com/sirupsen/logrus"
)

//nolint:gocyclo
Expand DownExpand Up@@ -180,7 +182,7 @@ func (s *composeService) doBuildClassic(ctx context.Context, project *types.Proj
aux := func(msg jsonmessage.JSONMessage) {
var result dockertypes.BuildResult
if err := json.Unmarshal(*msg.Aux, &result); err != nil {
fmt.Fprintf(s.stderr(), "Failed to parse aux message: %s", err)
logrus.Errorf("Failed to parse aux message: %s", err)
} else {
imageID = result.ID
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/compose/down.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import (
imageapi "github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/errdefs"
"github.com/sirupsen/logrus"
"golang.org/x/sync/errgroup"
)

Expand DownExpand Up@@ -107,7 +108,7 @@ func (s *composeService) down(ctx context.Context, projectName string, options a
}

if !resourceToRemove && len(ops) == 0 {
fmt.Fprintf(s.stderr(), "Warning: No resource found to remove for project %q.\n", projectName)
logrus.Warnf("Warning: No resource found to remove for project %q.", projectName)
}

eg, _ := errgroup.WithContext(ctx)
Expand Down