Fix log config file

Signed-off-by: Emile Vauge <emile@vauge.com>
This commit is contained in:
Emile Vauge 2016-05-30 17:57:57 +02:00
parent db6c85d3d7
commit 0e3c2ef10f
No known key found for this signature in database
GPG key ID: D808B4C167352E59

View file

@ -101,9 +101,6 @@ func run(traefikConfiguration *TraefikConfiguration) {
} }
log.SetLevel(level) log.SetLevel(level)
if len(traefikConfiguration.ConfigFile) != 0 {
log.Infof("Using TOML configuration file %s", traefikConfiguration.ConfigFile)
}
if traefikConfiguration.File != nil && len(traefikConfiguration.File.Filename) == 0 { if traefikConfiguration.File != nil && len(traefikConfiguration.File.Filename) == 0 {
// no filename, setting to global config file // no filename, setting to global config file
if len(traefikConfiguration.ConfigFile) != 0 { if len(traefikConfiguration.ConfigFile) != 0 {
@ -136,6 +133,9 @@ func run(traefikConfiguration *TraefikConfiguration) {
} }
jsonConf, _ := json.Marshal(globalConfiguration) jsonConf, _ := json.Marshal(globalConfiguration)
log.Infof("Traefik version %s built on %s", Version, BuildDate) log.Infof("Traefik version %s built on %s", Version, BuildDate)
if len(traefikConfiguration.ConfigFile) != 0 {
log.Infof("Using TOML configuration file %s", traefikConfiguration.ConfigFile)
}
log.Debugf("Global configuration loaded %s", string(jsonConf)) log.Debugf("Global configuration loaded %s", string(jsonConf))
server := NewServer(globalConfiguration) server := NewServer(globalConfiguration)
server.Start() server.Start()