Fix nil pointer panic when dropping collectd points

Fixes #5449
2016-01-28 21:35:34 -07:00 · 2016-01-28 21:35:34 -07:00 · 01193668cf
parent 834744a4c3
commit 01193668cf
2 changed files with 2 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -31,6 +31,7 @@
 - [#5382](https://github.com/influxdata/influxdb/pull/5382): Fixes some escaping bugs with tag keys and values.
 - [#5349](https://github.com/influxdata/influxdb/issues/5349): Validate metadata blob for 'influxd backup'
 - [#5469](https://github.com/influxdata/influxdb/issues/5469): Conversion from bz1 to tsm doesn't work as described
+- [#5449](https://github.com/influxdata/influxdb/issues/5449): panic when dropping collectd points

 ## v0.9.6 [2015-12-09]

--- a/services/collectd/service.go
+++ b/services/collectd/service.go
@ -299,7 +299,7 @@ func (s *Service) UnmarshalCollectd(packet *gollectd.Packet) []models.Point {
 		p, err := models.NewPoint(name, tags, fields, timestamp)
 		// Drop invalid points
 		if err != nil {
-			s.Logger.Printf("Dropping point %v: %v", p.Name, err)
+			s.Logger.Printf("Dropping point %v: %v", name, err)
 			s.statMap.Add(statDroppedPointsInvalid, 1)
 			continue
 		}