baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Improve acme logs.

Browse source
This commit is contained in:
Ludovic Fernandez 2019-07-22 10:16:04 +02:00 committed by Traefiker Bot
parent 75c99a0491
commit 28500989bc
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/provider/acme/challenge_http.go
View file

@ -42,7 +42,7 @@ func (p *Provider) Append(router *mux.Router) {
Handler(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { Handler(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
vars := mux.Vars(req) vars := mux.Vars(req)
ctx := log.With(context.Background(), log.Str(log.ProviderName, "acme")) ctx := log.With(context.Background(), log.Str(log.ProviderName, p.ResolverName+".acme"))
logger := log.FromContext(ctx) logger := log.FromContext(ctx)
if token, ok := vars["token"]; ok { if token, ok := vars["token"]; ok {

13
pkg/provider/acme/provider.go
View file

@ -115,8 +115,7 @@ func (p *Provider) ListenConfiguration(config dynamic.Configuration) {
// Init for compatibility reason the BaseProvider implements an empty Init // Init for compatibility reason the BaseProvider implements an empty Init
func (p *Provider) Init() error { func (p *Provider) Init() error {
ctx := log.With(context.Background(), log.Str(log.ProviderName, p.ResolverName+".acme"))
ctx := log.With(context.Background(), log.Str(log.ProviderName, "acme"))
logger := log.FromContext(ctx) logger := log.FromContext(ctx)
if len(p.Configuration.Storage) == 0 { if len(p.Configuration.Storage) == 0 {
@ -167,7 +166,7 @@ func isAccountMatchingCaServer(ctx context.Context, accountURI string, serverURI
// Provide allows the file provider to provide configurations to traefik // Provide allows the file provider to provide configurations to traefik
// using the given Configuration channel. // using the given Configuration channel.
func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.Pool) error { func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.Pool) error {
ctx := log.With(context.Background(), log.Str(log.ProviderName, "acme."+p.ResolverName)) ctx := log.With(context.Background(), log.Str(log.ProviderName, p.ResolverName+".acme"))
p.pool = pool p.pool = pool
@ -199,7 +198,7 @@ func (p *Provider) getClient() (*lego.Client, error) {
p.clientMutex.Lock() p.clientMutex.Lock()
defer p.clientMutex.Unlock() defer p.clientMutex.Unlock()
ctx := log.With(context.Background(), log.Str(log.ProviderName, "acme")) ctx := log.With(context.Background(), log.Str(log.ProviderName, p.ResolverName+".acme"))
logger := log.FromContext(ctx) logger := log.FromContext(ctx)
if p.client != nil { if p.client != nil {
@ -371,7 +370,7 @@ func (p *Provider) watchNewDomains(ctx context.Context) {
domain := domains[i] domain := domains[i]
safe.Go(func() { safe.Go(func() {
if _, err := p.resolveCertificate(ctx, domain, tlsStore); err != nil { if _, err := p.resolveCertificate(ctx, domain, tlsStore); err != nil {
log.WithoutContext().WithField(log.ProviderName, "acme."+p.ResolverName). log.WithoutContext().WithField(log.ProviderName, p.ResolverName+".acme").
Errorf("Unable to obtain ACME certificate for domains %q : %v", strings.Join(domain.ToStrArray(), ","), err) Errorf("Unable to obtain ACME certificate for domains %q : %v", strings.Join(domain.ToStrArray(), ","), err)
} }
}) })
@ -400,7 +399,7 @@ func (p *Provider) watchNewDomains(ctx context.Context) {
domain := domains[i] domain := domains[i]
safe.Go(func() { safe.Go(func() {
if _, err := p.resolveCertificate(ctx, domain, tlsStore); err != nil { if _, err := p.resolveCertificate(ctx, domain, tlsStore); err != nil {
log.WithoutContext().WithField(log.ProviderName, "acme."+p.ResolverName). log.WithoutContext().WithField(log.ProviderName, p.ResolverName+".acme").
Errorf("Unable to obtain ACME certificate for domains %q : %v", strings.Join(domain.ToStrArray(), ","), err) Errorf("Unable to obtain ACME certificate for domains %q : %v", strings.Join(domain.ToStrArray(), ","), err)
} }
}) })
@ -593,7 +592,7 @@ func (p *Provider) saveCertificates() error {
func (p *Provider) refreshCertificates() { func (p *Provider) refreshCertificates() {
conf := dynamic.Message{ conf := dynamic.Message{
ProviderName: "acme." + p.ResolverName, ProviderName: p.ResolverName + ".acme",
Configuration: &dynamic.Configuration{ Configuration: &dynamic.Configuration{
HTTP: &dynamic.HTTPConfiguration{ HTTP: &dynamic.HTTPConfiguration{
Routers: map[string]*dynamic.Router{}, Routers: map[string]*dynamic.Router{},