Merge branch 'master' into alerting

2016-06-17 07:44:21 +02:00
parent 8ec311ade4 8b2f6fffc9
commit 1771ab032e
5 changed files with 32 additions and 25 deletions
@@ -180,17 +180,7 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) {
 			loggersToClose = append(loggersToClose, fileHandler)
 			handler = fileHandler
 		case "syslog":
-			sysLogHandler := NewSyslog()
-			sysLogHandler.Format = format
-			sysLogHandler.Network = sec.Key("network").MustString("")
-			sysLogHandler.Address = sec.Key("address").MustString("")
-			sysLogHandler.Facility = sec.Key("facility").MustString("local7")
-			sysLogHandler.Tag = sec.Key("tag").MustString("")
-
-			if err := sysLogHandler.Init(); err != nil {
-				Root.Error("Failed to init syslog log handler", "error", err)
-				os.Exit(1)
-			}
+			sysLogHandler := NewSyslog(sec, format)

 			loggersToClose = append(loggersToClose, sysLogHandler)
 			handler = sysLogHandler