Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Enyim.Caching/Enyim.Caching.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>EnyimMemcachedCore is a Memcached client library for .NET Core. Usage: Add services.AddEnyimMemcached(...) and app.UseEnyimMemcached() in Startup. Add IMemcachedClient into constructor.</Description>
<VersionPrefix>2.1.0.7</VersionPrefix>
<VersionPrefix>2.1.1</VersionPrefix>
<Authors>cnblogs.com</Authors>
<TargetFramework>netstandard2.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
19 changes: 17 additions & 2 deletions Enyim.Caching/EnyimMemcachedServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,22 @@ public static IServiceCollection AddEnyimMemcached(this IServiceCollection servi
return AddEnyimMemcached(services, s => s.Configure(setupAction));
}

public static IServiceCollection AddEnyimMemcached(this IServiceCollection services, IConfiguration configuration)
public static IServiceCollection AddEnyimMemcached(this IServiceCollection services, IConfigurationSection configurationSection)
{
if (services == null)
{
throw new ArgumentNullException(nameof(services));
}

if (configurationSection == null)
{
throw new ArgumentNullException(nameof(configurationSection));
}

return AddEnyimMemcached(services, s => s.Configure<MemcachedClientOptions>(configurationSection));
}

public static IServiceCollection AddEnyimMemcached(this IServiceCollection services, IConfiguration configuration, string sectionKey = "enyimMemcached")
{
if (services == null)
{
Expand All @@ -38,7 +53,7 @@ public static IServiceCollection AddEnyimMemcached(this IServiceCollection servi
throw new ArgumentNullException(nameof(configuration));
}

return AddEnyimMemcached(services, s => s.Configure<MemcachedClientOptions>(configuration));
return AddEnyimMemcached(services, s => s.Configure<MemcachedClientOptions>(configuration.GetSection(sectionKey)));
}

private static IServiceCollection AddEnyimMemcached(IServiceCollection services, Action<IServiceCollection> configure)
Expand Down
4 changes: 3 additions & 1 deletion SampleWebApp/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ public Startup(IHostingEnvironment env)

public void ConfigureServices(IServiceCollection services)
{
services.AddEnyimMemcached(Configuration.GetSection("enyimMemcached"));
services.AddEnyimMemcached(Configuration);
//services.AddEnyimMemcached(Configuration, "enyimMemcached");
//services.AddEnyimMemcached(Configuration.GetSection("enyimMemcached"));
}

public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
Expand Down