From 1e3014c417344a2bee3fff3d632320cd7f0aaf9e Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Wed, 17 Feb 2016 18:53:43 +0000 Subject: [PATCH] Fix weave tagger crash --- probe/overlay/weave.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/probe/overlay/weave.go b/probe/overlay/weave.go index f908bd535..1a384daaa 100644 --- a/probe/overlay/weave.go +++ b/probe/overlay/weave.go @@ -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