From e7b7ae94b0633ff872a9e0948a6f6b0ffc61c900 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 11 Oct 2019 17:20:05 +0200 Subject: [PATCH] fix: add filename in the file provider logs. --- docs/content/routing/services/index.md | 2 +- pkg/provider/file/file.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/content/routing/services/index.md b/docs/content/routing/services/index.md index 2e8b4e53e..cd48b5ba8 100644 --- a/docs/content/routing/services/index.md +++ b/docs/content/routing/services/index.md @@ -539,7 +539,7 @@ The `address` option (IP:Port) point to a specific instance. my-service: loadBalancer: servers: - address: "xx.xx.xx.xx:xx" + - address: "xx.xx.xx.xx:xx" ``` #### Termination Delay diff --git a/pkg/provider/file/file.go b/pkg/provider/file/file.go index f8125349d..862b9e1a2 100644 --- a/pkg/provider/file/file.go +++ b/pkg/provider/file/file.go @@ -199,8 +199,6 @@ func flattenCertificates(ctx context.Context, tlsConfig *dynamic.TLSConfiguratio } func (p *Provider) loadFileConfigFromDirectory(ctx context.Context, directory string, configuration *dynamic.Configuration) (*dynamic.Configuration, error) { - logger := log.FromContext(ctx) - fileList, err := ioutil.ReadDir(directory) if err != nil { return configuration, fmt.Errorf("unable to read directory %s: %v", directory, err) @@ -227,6 +225,8 @@ func (p *Provider) loadFileConfigFromDirectory(ctx context.Context, directory st configTLSMaps := make(map[*tls.CertAndStores]struct{}) for _, item := range fileList { + logger := log.FromContext(log.With(ctx, log.Str("filename", item.Name()))) + if item.IsDir() { configuration, err = p.loadFileConfigFromDirectory(ctx, filepath.Join(directory, item.Name()), configuration) if err != nil { @@ -245,7 +245,7 @@ func (p *Provider) loadFileConfigFromDirectory(ctx context.Context, directory st var c *dynamic.Configuration c, err = p.loadFileConfig(ctx, filepath.Join(directory, item.Name()), true) if err != nil { - return configuration, err + return configuration, fmt.Errorf("%s: %v", filepath.Join(directory, item.Name()), err) } for name, conf := range c.HTTP.Routers {