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

Log mesh messages at debug level

This commit is contained in:
Fabian Reinartz 2017-05-09 16:07:27 +02:00
parent 672e9b205f
commit 8ccb95c9f5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/alertmanager/main.go
View File

@ -18,8 +18,6 @@ import (
"encoding/binary" "encoding/binary"
"flag" "flag"
"fmt" "fmt"
"io/ioutil"
stdlog "log"
"net" "net"
"net/http" "net/http"
"net/url" "net/url"
@ -117,7 +115,7 @@ func main() {
} }
logger := log.NewLogger(os.Stderr) logger := log.NewLogger(os.Stderr)
mrouter, err := initMesh(*meshListen, *hwaddr, *nickname, *password) mrouter, err := initMesh(*meshListen, *hwaddr, *nickname, *password, log.With("component", "mesh"))
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -198,7 +196,7 @@ func main() {
apiv := api.New(alerts, silences, func(matchers []*labels.Matcher) dispatch.AlertOverview { apiv := api.New(alerts, silences, func(matchers []*labels.Matcher) dispatch.AlertOverview {
return disp.Groups(matchers) return disp.Groups(matchers)
}, mrouter) }, mrouter)
q
amURL, err := extURL(*listenAddress, *externalURL) amURL, err := extURL(*listenAddress, *externalURL)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
@ -333,7 +331,7 @@ func meshWait(r *mesh.Router, timeout time.Duration) func() time.Duration {
} }
} }
func initMesh(addr, hwaddr, nickname, pw string) (*mesh.Router, error) { func initMesh(addr, hwaddr, nickname, pw string, logger log.Logger) (*mesh.Router, error) {
host, portStr, err := net.SplitHostPort(addr) host, portStr, err := net.SplitHostPort(addr)
if err != nil { if err != nil {
@ -364,8 +362,15 @@ func initMesh(addr, hwaddr, nickname, pw string) (*mesh.Router, error) {
ConnLimit: 64, ConnLimit: 64,
PeerDiscovery: true, PeerDiscovery: true,
TrustedSubnets: []*net.IPNet{}, TrustedSubnets: []*net.IPNet{},
}, name, nickname, mesh.NullOverlay{}, stdlog.New(ioutil.Discard, "", 0)) }, name, nickname, mesh.NullOverlay{}, printfLogger{logger})
}
type printfLogger struct {
log.Logger
}
func (l printfLogger) Printf(f string, args ...interface{}) {
l.Debugf(f, args...)
} }
func extURL(listen, external string) (*url.URL, error) { func extURL(listen, external string) (*url.URL, error) {