RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use logging options consistently for all components #967 (#968)

This commit is contained in:
Jack Neely 2017-09-02 05:24:11 -04:00 committed by stuart nelson
parent a5b2e0bbcc
commit 0dfdda3074
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/alertmanager/main.go
View File

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