diff --git a/src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs b/src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs index 7147b40a..a2ebb709 100644 --- a/src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs +++ b/src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs @@ -9,6 +9,7 @@ using Ocelot.Configuration.File; using Ocelot.Configuration.Parser; using Ocelot.Configuration.Validator; using Ocelot.LoadBalancer.LoadBalancers; +using Ocelot.Logging; using Ocelot.Requester.QoS; using Ocelot.Responses; using Ocelot.Utilities; @@ -22,7 +23,7 @@ namespace Ocelot.Configuration.Creator { private readonly IOptions _options; private readonly IConfigurationValidator _configurationValidator; - private readonly ILogger _logger; + private readonly IOcelotLogger _logger; private readonly ILoadBalancerFactory _loadBalanceFactory; private readonly ILoadBalancerHouse _loadBalancerHouse; private readonly IQoSProviderFactory _qoSProviderFactory; @@ -38,8 +39,8 @@ namespace Ocelot.Configuration.Creator public FileOcelotConfigurationCreator( IOptions options, - IConfigurationValidator configurationValidator, - ILogger logger, + IConfigurationValidator configurationValidator, + IOcelotLoggerFactory loggerFactory, ILoadBalancerFactory loadBalancerFactory, ILoadBalancerHouse loadBalancerHouse, IQoSProviderFactory qoSProviderFactory, @@ -64,7 +65,7 @@ namespace Ocelot.Configuration.Creator _qosProviderHouse = qosProviderHouse; _options = options; _configurationValidator = configurationValidator; - _logger = logger; + _logger = loggerFactory.CreateLogger(); _claimsToThingCreator = claimsToThingCreator; _serviceProviderConfigCreator = serviceProviderConfigCreator; _qosOptionsCreator = qosOptionsCreator; diff --git a/test/Ocelot.UnitTests/Configuration/FileConfigurationCreatorTests.cs b/test/Ocelot.UnitTests/Configuration/FileConfigurationCreatorTests.cs index e3293a90..e6968d9d 100644 --- a/test/Ocelot.UnitTests/Configuration/FileConfigurationCreatorTests.cs +++ b/test/Ocelot.UnitTests/Configuration/FileConfigurationCreatorTests.cs @@ -8,6 +8,7 @@ using Ocelot.Configuration.Creator; using Ocelot.Configuration.File; using Ocelot.Configuration.Validator; using Ocelot.LoadBalancer.LoadBalancers; +using Ocelot.Logging; using Ocelot.Requester.QoS; using Ocelot.Responses; using Shouldly; @@ -22,7 +23,7 @@ namespace Ocelot.UnitTests.Configuration private readonly Mock _validator; private Response _config; private FileConfiguration _fileConfiguration; - private readonly Mock> _logger; + private readonly Mock _logger; private readonly FileOcelotConfigurationCreator _ocelotConfigurationCreator; private readonly Mock _loadBalancerFactory; private readonly Mock _loadBalancerHouse; @@ -44,7 +45,7 @@ namespace Ocelot.UnitTests.Configuration _qosProviderFactory = new Mock(); _qosProviderHouse = new Mock(); _qosProvider = new Mock(); - _logger = new Mock>(); + _logger = new Mock(); _validator = new Mock(); _fileConfig = new Mock>(); _loadBalancerFactory = new Mock();