From 0dfdda3074fa2d19c22dddba42e624078fadfeaf Mon Sep 17 00:00:00 2001
From: Jack Neely <jjneely@gmail.com>
Date: Sat, 2 Sep 2017 05:24:11 -0400
Subject: [PATCH] Use logging options consistently for all components #967
 (#968)

---
 cmd/alertmanager/main.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cmd/alertmanager/main.go b/cmd/alertmanager/main.go
index fd8bfa25..639d6827 100644
--- a/cmd/alertmanager/main.go
+++ b/cmd/alertmanager/main.go
@@ -114,8 +114,6 @@ func main() {
 		log.Fatal(err)
 	}
 
-	logger := log.NewLogger(os.Stderr)
-
 	var mrouter *mesh.Router
 	if *meshListen != "" {
 		mrouter, err = initMesh(*meshListen, *hwaddr, *nickname, *password, log.With("component", "mesh"))
@@ -133,7 +131,7 @@ func main() {
 		nflog.WithSnapshot(filepath.Join(*dataDir, "nflog")),
 		nflog.WithMaintenance(15*time.Minute, stopc, wg.Done),
 		nflog.WithMetrics(prometheus.DefaultRegisterer),
-		nflog.WithLogger(logger.With("component", "nflog")),
+		nflog.WithLogger(log.Base().With("component", "nflog")),
 	}
 	if *meshListen != "" {
 		notificationLogOpts = append(notificationLogOpts, nflog.WithMesh(func(g mesh.Gossiper) mesh.Gossip {
@@ -154,7 +152,7 @@ func main() {
 	silenceOpts := silence.Options{
 		SnapshotFile: filepath.Join(*dataDir, "silences"),
 		Retention:    *retention,
-		Logger:       logger.With("component", "silences"),
+		Logger:       log.Base().With("component", "silences"),
 		Metrics:      prometheus.DefaultRegisterer,
 	}
 	if *meshListen != "" {