silva
/
compose
mirror of https://github.com/viniciusfdasilva/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1630 from ndeloof/logs_panic 

don't invoke r.Close on error as r == nil
This commit is contained in:
Nicolas De loof 2021-05-04 10:40:56 +02:00 committed by GitHub
parent de8834d434 87abb4eb9c
commit 2c79e63b83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)