From a2aa3e473cc076ad6da0a066f9a1f26e086276cb Mon Sep 17 00:00:00 2001 From: Nathaniel Cook Date: Thu, 26 May 2016 15:49:16 -0600 Subject: [PATCH] remove panic in SMTP service --- CHANGELOG.md | 1 + services/smtp/service.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 305841180..32aeba455 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ kapacitor replay-live query -task cpu_alert -query 'SELECT usage_idle FROM teleg - [#521](https://github.com/influxdata/kapacitor/issues/521): EvalNode now honors groups. - [#561](https://github.com/influxdata/kapacitor/issues/561): Fixes bug when lambda expressions would return error about types with nested binary expressions. - [#555](https://github.com/influxdata/kapacitor/issues/555): Fixes bug where "time" functions didn't work in lambda expressions. +- [#570](https://github.com/influxdata/kapacitor/issues/570): Removes panic in SMTP service on failed close connection. ## v0.13.1 [2016-05-13] diff --git a/services/smtp/service.go b/services/smtp/service.go index d3a9c5292..fced31ddf 100644 --- a/services/smtp/service.go +++ b/services/smtp/service.go @@ -88,7 +88,7 @@ func (s *Service) runMailer() { case <-time.After(time.Duration(s.c.IdleTimeout)): if open { if err := conn.Close(); err != nil { - panic(err) + s.logger.Println("E! error closing connection to SMTP server:", err) } open = false }