tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-24 22:24:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

don't invoke r.Close on error as r == nil

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-05-04 08:42:49 +02:00
parent de8834d434
commit 87abb4eb9c
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
local/compose/logs.go
View File

@ -51,11 +51,11 @@ func (s *composeService) Logs(ctx context.Context, projectName string, consumer
Tail: options.Tail, Tail: options.Tail,
Timestamps: options.Timestamps, Timestamps: options.Timestamps,
}) })
defer r.Close() // nolint errcheck
if err != nil { if err != nil {
return err return err
} }
defer r.Close() // nolint errcheck
name := getContainerNameWithoutProject(c) name := getContainerNameWithoutProject(c)
w := utils.GetWriter(name, service, func(event compose.ContainerEvent) { w := utils.GetWriter(name, service, func(event compose.ContainerEvent) {
consumer.Log(name, service, event.Line) consumer.Log(name, service, event.Line)