github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-02 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix weave tagger crash

Browse Source
This commit is contained in:
Alfonso Acosta
2016-02-17 18:53:43 +00:00
parent 07d34205ce
commit 1e3014c417
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
probe/overlay/weave.go
View File

@@ -134,9 +134,15 @@ func (w *Weave) Tag(r report.Report) (report.Report, error) {
}
// Put information from weave ps on the container nodes
const maxPrefixSize = 12
for id, node := range r.Container.Nodes {
prefix, _ := node.Latest.Lookup(docker.ContainerID)
prefix = prefix[:12]
prefix, ok := node.Latest.Lookup(docker.ContainerID)
if !ok {
continue
}
if len(prefix) > maxPrefixSize {
prefix = prefix[:maxPrefixSize]
}
entry, ok := w.psCache[prefix]
if !ok {
continue