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

Merge pull request #510 from dnephin/add-parse-log-details

Browse Source 
Use a local copy of ParseLogDetails
Upstream-commit: aae519d0f6
Component: cli
This commit is contained in:
Victor Vieux
2017-09-08 11:38:24 -07:00
committed by GitHub
parent fbd21afa80 0d3330814c
commit 30a4e0ab8e
3 changed files with 74 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/cli/cli/command/service/logs.go
View File

@ -13,6 +13,7 @@ import (
"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/idresolver"
"github.com/docker/cli/service/logs"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/client"
@ -257,7 +258,7 @@ func (lw *logWriter) Write(buf []byte) (int, error) {
return 0, errors.Errorf("invalid context in log message: %v", string(buf))
}
// parse the details out
details, err := client.ParseLogDetails(string(parts[detailsIndex]))
details, err := logs.ParseLogDetails(string(parts[detailsIndex]))
if err != nil {
return 0, err
}