toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #31313 from dperny/31306-fix-specify-stdoutstderr

Browse Source 
Fix service logs API to be able to specify stream
Upstream-commit: dd4a6c5affa60fda3affc2ab0e06ac4beb4c226e
Component: engine
This commit is contained in:
Brian Goff
2017-02-24 09:11:38 -05:00
committed by GitHub
parent 90c65de535 1d2d461e40
commit e0f0da5569
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/engine/daemon/cluster/services.go
View File

@ -277,12 +277,22 @@ func (c *Cluster) ServiceLogs(ctx context.Context, input string, config *backend
return err
}
// set the streams we'll use
stdStreams := []swarmapi.LogStream{}
if config.ContainerLogsOptions.ShowStdout {
stdStreams = append(stdStreams, swarmapi.LogStreamStdout)
}
if config.ContainerLogsOptions.ShowStderr {
stdStreams = append(stdStreams, swarmapi.LogStreamStderr)
}
stream, err := state.logsClient.SubscribeLogs(ctx, &swarmapi.SubscribeLogsRequest{
Selector: &swarmapi.LogSelector{
ServiceIDs: []string{service.ID},
},
Options: &swarmapi.LogSubscriptionOptions{
Follow: config.Follow,
Follow: config.Follow,
Streams: stdStreams,
},
})
if err != nil {