tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-11-04 15:30:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

#296 renamed configuration.json to ocelot.json in preparation

Browse Source
This commit is contained in:
Tom Pallister
2018-04-13 11:23:44 +01:00
parent b46ef1945d
commit cbaa2c3096
39 changed files with 76 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Ocelot/Configuration/Provider/FileConfigurationProvider.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.IO;
using System.Threading.Tasks;
using Newtonsoft.Json;
using Ocelot.Configuration.File;
using Ocelot.Configuration.Repository;
using Ocelot.Responses;
@@ -10,7 +7,7 @@ namespace Ocelot.Configuration.Provider
{
public class FileConfigurationProvider : IFileConfigurationProvider
{
private IFileConfigurationRepository _repo;
private readonly IFileConfigurationRepository _repo;
public FileConfigurationProvider(IFileConfigurationRepository repo)
{
@@ -23,4 +20,4 @@ namespace Ocelot.Configuration.Provider
return new OkResponse<FileConfiguration>(fileConfig.Data);
}
}
}
}

6
src/Ocelot/Configuration/Repository/FileConfigurationRepository.cs
View File

@@ -12,10 +12,12 @@ namespace Ocelot.Configuration.Repository
private readonly string _configFilePath;
private static readonly object _lock = new object();
private const string ConfigurationFileName = "ocelot";
public FileConfigurationRepository(IHostingEnvironment hostingEnvironment)
{
_configFilePath = $"{AppContext.BaseDirectory}/configuration{(string.IsNullOrEmpty(hostingEnvironment.EnvironmentName) ? string.Empty : ".")}{hostingEnvironment.EnvironmentName}.json";
_configFilePath = $"{AppContext.BaseDirectory}/{ConfigurationFileName}{(string.IsNullOrEmpty(hostingEnvironment.EnvironmentName) ? string.Empty : ".")}{hostingEnvironment.EnvironmentName}.json";
}
public Task<Response<FileConfiguration>> Get()

2
src/Ocelot/DependencyInjection/ConfigurationBuilderExtensions.cs
View File

@@ -7,7 +7,7 @@ namespace Ocelot.DependencyInjection
{
public static class ConfigurationBuilderExtensions
{
[Obsolete("Please set BaseUrl in configuration.json GlobalConfiguration.BaseUrl")]
[Obsolete("Please set BaseUrl in ocelot.json GlobalConfiguration.BaseUrl")]
public static IConfigurationBuilder AddOcelotBaseUrl(this IConfigurationBuilder builder, string baseUrl)
{
var memorySource = new MemoryConfigurationSource();