remove panic in SMTP service (influxdata#579)

tct492 · May 27, 2016 · 1315700 · 1315700
1 parent ff9b935
commit 1315700
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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
 			}