MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't follow if there is an error

Browse Source
This commit is contained in:
Dane Everitt
2020-12-25 17:09:35 -08:00
parent 94d41bc1f5
commit 1ba3631cc1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
environment/docker/container.go
View File

@@ -292,7 +292,9 @@ func (e *Environment) followOutput() error {
} }
reader, err := e.client.ContainerLogs(context.Background(), e.Id, opts) reader, err := e.client.ContainerLogs(context.Background(), e.Id, opts)
if err != nil {
return err
}
go func(reader io.ReadCloser) { go func(reader io.ReadCloser) {
defer reader.Close() defer reader.Close()
evts := e.Events() evts := e.Events()
@@ -303,8 +305,7 @@ func (e *Environment) followOutput() error {
log.WithField("error", err).WithField("container_id", e.Id).Warn("error processing scanner line in console output") log.WithField("error", err).WithField("container_id", e.Id).Warn("error processing scanner line in console output")
} }
}(reader) }(reader)
return nil
return err
} }
// Pulls the image from Docker. If there is an error while pulling the image from the source // Pulls the image from Docker. If there is an error while pulling the image from the source