From 39df2635bd42800c4afd1ef7de521fe526f81bed Mon Sep 17 00:00:00 2001 From: Zdenek Styblik Date: Sun, 15 May 2016 11:19:53 +0000 Subject: [PATCH] Fix crash in Docker input plugin - Fixes #1195 Commit fixes crash in Docker input plugin caused by the fact that return value might be nil when error occurs. closes #1195 --- CHANGELOG.md | 2 ++ plugins/inputs/docker/docker.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 840f46e88..a8a75617e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ ### Bugfixes +- [#1195](https://github.com/influxdata/telegraf/pull/1195): Docker panic on timeout. Thanks @zstyblik! + ## v0.13 [2016-05-11] ### Release Notes diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go index 727c4342c..0af7820e1 100644 --- a/plugins/inputs/docker/docker.go +++ b/plugins/inputs/docker/docker.go @@ -221,7 +221,7 @@ func (d *Docker) gatherContainer( defer cancel() r, err := d.client.ContainerStats(ctx, container.ID, false) if err != nil { - log.Printf("Error getting docker stats: %s\n", err.Error()) + return fmt.Errorf("Error getting docker stats: %s", err.Error()) } defer r.Close() dec := json.NewDecoder(r)