mirrors/traefik
1
0
Fork 0
mirror of https://github.com/traefik/traefik.git synced 2025-09-26 16:21:15 +02:00
Code Issues Projects Releases Wiki Activity

fix: add filename in the file provider logs.

Browse Source
This commit is contained in:
Ludovic Fernandez 2019-10-11 17:20:05 +02:00 committed by Traefiker Bot
parent 17ce295c30
commit e7b7ae94b0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/content/routing/services/index.md
View File

@ -539,7 +539,7 @@ The `address` option (IP:Port) point to a specific instance.
my-service: my-service:
loadBalancer: loadBalancer:
servers: servers:
address: "xx.xx.xx.xx:xx" - address: "xx.xx.xx.xx:xx"
``` ```
#### Termination Delay #### Termination Delay

6
pkg/provider/file/file.go
View File

@ -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) { func (p *Provider) loadFileConfigFromDirectory(ctx context.Context, directory string, configuration *dynamic.Configuration) (*dynamic.Configuration, error) {
logger := log.FromContext(ctx)
fileList, err := ioutil.ReadDir(directory) fileList, err := ioutil.ReadDir(directory)
if err != nil { if err != nil {
return configuration, fmt.Errorf("unable to read directory %s: %v", directory, err) 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{}) configTLSMaps := make(map[*tls.CertAndStores]struct{})
for _, item := range fileList { for _, item := range fileList {
logger := log.FromContext(log.With(ctx, log.Str("filename", item.Name())))
if item.IsDir() { if item.IsDir() {
configuration, err = p.loadFileConfigFromDirectory(ctx, filepath.Join(directory, item.Name()), configuration) configuration, err = p.loadFileConfigFromDirectory(ctx, filepath.Join(directory, item.Name()), configuration)
if err != nil { if err != nil {
@ -245,7 +245,7 @@ func (p *Provider) loadFileConfigFromDirectory(ctx context.Context, directory st
var c *dynamic.Configuration var c *dynamic.Configuration
c, err = p.loadFileConfig(ctx, filepath.Join(directory, item.Name()), true) c, err = p.loadFileConfig(ctx, filepath.Join(directory, item.Name()), true)
if err != nil { 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 { for name, conf := range c.HTTP.Routers {