Merge branch '3.1.x'
This commit is contained in:
@@ -34,6 +34,7 @@ import org.springframework.boot.context.config.ConfigDataLoader;
|
||||
import org.springframework.boot.context.config.ConfigDataLoaderContext;
|
||||
import org.springframework.boot.context.properties.bind.Binder;
|
||||
import org.springframework.boot.env.OriginTrackedMapPropertySource;
|
||||
import org.springframework.boot.logging.DeferredLogFactory;
|
||||
import org.springframework.boot.origin.Origin;
|
||||
import org.springframework.boot.origin.OriginTrackedValue;
|
||||
import org.springframework.cloud.config.client.ConfigClientProperties.MultipleUriStrategy;
|
||||
@@ -69,6 +70,10 @@ public class ConfigServerConfigDataLoader implements ConfigDataLoader<ConfigServ
|
||||
|
||||
protected final Log logger;
|
||||
|
||||
public ConfigServerConfigDataLoader(DeferredLogFactory logFactory) {
|
||||
this.logger = logFactory.getLog(getClass());
|
||||
}
|
||||
|
||||
public ConfigServerConfigDataLoader(Log logger) {
|
||||
this.logger = logger;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user