Skip to content

Add a parameterless AddEnyimMemcached method #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 24, 2018
Merged

Add a parameterless AddEnyimMemcached method #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
028c828
Update nuget packages
cnblogs-dudu May 24, 2018
4426f38
Remove web.config
cnblogs-dudu May 24, 2018
11a03d3
Add a parameterless AddEnyimMemcached method
cnblogs-dudu May 24, 2018
bcc1a3c
Change package version
cnblogs-dudu May 24, 2018
b0c2acf
Fix test failure
cnblogs-dudu May 24, 2018
134bbcc
Fix test failures in Enyim.Caching.Tests
cnblogs-dudu May 24, 2018
e127633
Fix test failures in MemcachedTest
cnblogs-dudu May 24, 2018
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
4 changes: 2 additions & 2 deletions Enyim.Caching.Tests/Enyim.Caching.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
</ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions Enyim.Caching.Tests/MemcachedClientTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Enyim.Caching.Memcached;
using Xunit;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Configuration;

namespace Enyim.Caching.Tests
{
Expand All @@ -17,6 +18,8 @@ public abstract class MemcachedClientTestsBase
public MemcachedClientTestsBase()
{
IServiceCollection services = new ServiceCollection();
var configuration = new ConfigurationBuilder().Build();
services.AddSingleton<IConfiguration>(configuration);
services.AddEnyimMemcached(options => options.AddServer("memcached", 11211));
services.AddLogging();
IServiceProvider serviceProvider = services.BuildServiceProvider();
Expand Down
7 changes: 7 additions & 0 deletions Enyim.Caching/Configuration/MemcachedClientConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Enyim.Caching.Memcached.Protocol.Binary;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Configuration;

namespace Enyim.Caching.Configuration
{
Expand All @@ -26,6 +27,7 @@ public class MemcachedClientConfiguration : IMemcachedClientConfiguration
public MemcachedClientConfiguration(
ILoggerFactory loggerFactory,
IOptions<MemcachedClientOptions> optionsAccessor,
IConfiguration configuration,
ITranscoder transcoder = null,
IMemcachedKeyTransformer keyTransformer = null)
{
Expand All @@ -37,6 +39,11 @@ public MemcachedClientConfiguration(
_logger = loggerFactory.CreateLogger<MemcachedClientConfiguration>();

var options = optionsAccessor.Value;
if(options == null || options.Servers.Count == 0)
{
configuration.GetSection("enyimMemcached").Bind(options);
}

Servers = new List<EndPoint>();
foreach (var server in options.Servers)
{
Expand Down
16 changes: 8 additions & 8 deletions Enyim.Caching/Enyim.Caching.csproj
View file
Open in desktop
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.1</VersionPrefix>
<VersionPrefix>2.1.2</VersionPrefix>
<Authors>cnblogs.com</Authors>
<TargetFramework>netstandard2.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand All @@ -16,13 +16,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.2" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.1" />
</ItemGroup>
</Project>
21 changes: 16 additions & 5 deletions Enyim.Caching/EnyimMemcachedServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ namespace Microsoft.Extensions.DependencyInjection
{
public static class EnyimMemcachedServiceCollectionExtensions
{
/// <summary>
/// Add EnyimMemcached to the specified <see cref="IServiceCollection"/>.
/// Read configuration via IConfiguration.GetSection("enyimMemcached")
/// </summary>
/// <param name="services"></param>
/// <returns></returns>
public static IServiceCollection AddEnyimMemcached(this IServiceCollection services)
{
return AddEnyimMemcachedInternal(services, null);
}

public static IServiceCollection AddEnyimMemcached(this IServiceCollection services, Action<MemcachedClientOptions> setupAction)
{
if (services == null)
Expand All @@ -23,7 +34,7 @@ public static IServiceCollection AddEnyimMemcached(this IServiceCollection servi
throw new ArgumentNullException(nameof(setupAction));
}

return AddEnyimMemcached(services, s => s.Configure(setupAction));
return AddEnyimMemcachedInternal(services, s => s.Configure(setupAction));
}

public static IServiceCollection AddEnyimMemcached(this IServiceCollection services, IConfigurationSection configurationSection)
Expand All @@ -38,7 +49,7 @@ public static IServiceCollection AddEnyimMemcached(this IServiceCollection servi
throw new ArgumentNullException(nameof(configurationSection));
}

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

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

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

private static IServiceCollection AddEnyimMemcached(IServiceCollection services, Action<IServiceCollection> configure)
private static IServiceCollection AddEnyimMemcachedInternal(IServiceCollection services, Action<IServiceCollection> configure)
{
services.AddOptions();
configure(services);
configure?.Invoke(services);

services.TryAddSingleton<ITranscoder, DefaultTranscoder>();
services.TryAddSingleton<IMemcachedKeyTransformer, DefaultKeyTransformer>();
Expand Down
121 changes: 62 additions & 59 deletions MemcachedTest/FailurePolicyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,85 +9,88 @@
using Xunit;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Configuration;

namespace MemcachedTest
{
public class FailurePolicyTest
{
[Fact]
public void TestIfCalled()
{
IServiceCollection services = new ServiceCollection();
services.AddEnyimMemcached(options => options.AddServer("memcached", 11212));
services.AddLogging();
IServiceProvider serviceProvider = services.BuildServiceProvider();

public class FailurePolicyTest
{
[Fact]
public void TestIfCalled()
{
IServiceProvider serviceProvider = getServiceProvider();
var config = serviceProvider.GetService<IMemcachedClientConfiguration>();
config.SocketPool.FailurePolicyFactory = new FakePolicy();
config.SocketPool.ConnectionTimeout = TimeSpan.FromSeconds(1);
config.SocketPool.ReceiveTimeout = TimeSpan.FromSeconds(1);

var logger = serviceProvider.GetService<ILoggerFactory>();

var client = new MemcachedClient(logger, config);
var client = new MemcachedClient(logger, config);

Assert.Null(client.Get("a"));
}

class FakePolicy : INodeFailurePolicy, INodeFailurePolicyFactory
{
bool INodeFailurePolicy.ShouldFail()
{
Assert.True(true);

return true;
}

INodeFailurePolicy INodeFailurePolicyFactory.Create(IMemcachedNode node)
{
return new FakePolicy();
}
}

[Fact]
public void TestThrottlingFailurePolicy()
{
IServiceCollection services = new ServiceCollection();
services.AddEnyimMemcached(options => options.AddServer("localhost", 11212));
services.AddLogging();
IServiceProvider serviceProvider = services.BuildServiceProvider();

var config = serviceProvider.GetService<IMemcachedClientConfiguration>();
config.SocketPool.FailurePolicyFactory = new ThrottlingFailurePolicyFactory(4, TimeSpan.FromMilliseconds(2000));
config.SocketPool.ConnectionTimeout = TimeSpan.FromMilliseconds(5);
config.SocketPool.ReceiveTimeout = TimeSpan.FromMilliseconds(5);
config.SocketPool.MinPoolSize = 1;
config.SocketPool.MaxPoolSize = 1;
}

class FakePolicy : INodeFailurePolicy, INodeFailurePolicyFactory
{
bool INodeFailurePolicy.ShouldFail()
{
Assert.True(true);

return true;
}

INodeFailurePolicy INodeFailurePolicyFactory.Create(IMemcachedNode node)
{
return new FakePolicy();
}
}

[Fact]
public void TestThrottlingFailurePolicy()
{
var serviceProvider = getServiceProvider();
var config = serviceProvider.GetService<IMemcachedClientConfiguration>();
config.SocketPool.FailurePolicyFactory = new ThrottlingFailurePolicyFactory(4, TimeSpan.FromMilliseconds(2000));
config.SocketPool.ConnectionTimeout = TimeSpan.FromMilliseconds(5);
config.SocketPool.ReceiveTimeout = TimeSpan.FromMilliseconds(5);
config.SocketPool.MinPoolSize = 1;
config.SocketPool.MaxPoolSize = 1;

var logger = serviceProvider.GetService<ILoggerFactory>();
var client = new MemcachedClient(logger, config);
var canFail = false;
var didFail = false;
var didFail = false;

client.NodeFailed += node =>
{
Assert.True(canFail, "canfail");
client.NodeFailed += node =>
{
Assert.True(canFail, "canfail");

didFail = true;
};
didFail = true;
};

Assert.Null(client.Get("a"));
Assert.Null(client.Get("a"));
Assert.Null(client.Get("a"));
Assert.Null(client.Get("a"));

canFail = true;
Thread.Sleep(2000);
canFail = true;
Thread.Sleep(2000);

Assert.Null(client.Get("a"));
Assert.Null(client.Get("a"));
Assert.Null(client.Get("a"));
Assert.Null(client.Get("a"));
Assert.Null(client.Get("a"));
Assert.Null(client.Get("a"));
Assert.Null(client.Get("a"));
Assert.Null(client.Get("a"));

Assert.True(didFail, "didfail");
}
}
Assert.True(didFail, "didfail");
}

private ServiceProvider getServiceProvider()
{
IServiceCollection services = new ServiceCollection();
var configuration = new ConfigurationBuilder().Build();
services.AddSingleton<IConfiguration>(configuration);
services.AddEnyimMemcached(options => options.AddServer("localhost", 11212));
services.AddLogging();
return services.BuildServiceProvider();
}
}
}
8 changes: 6 additions & 2 deletions MemcachedTest/MemcachedClientTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
using Microsoft.Extensions.Logging;
using System.Threading.Tasks;
using System.Linq;
using Microsoft.Extensions.Configuration;
using System.IO;

namespace MemcachedTest
{
Expand All @@ -29,11 +31,13 @@ protected virtual MemcachedClient GetClient(MemcachedProtocol protocol = Memcach
// options.Transcoder = "BinaryFormatterTranscoder";
//}
});
if(useBinaryFormatterTranscoder)
if (useBinaryFormatterTranscoder)
{
services.AddSingleton<ITranscoder,BinaryFormatterTranscoder>();
services.AddSingleton<ITranscoder, BinaryFormatterTranscoder>();
}

var configuration = new ConfigurationBuilder().Build();
services.AddSingleton<IConfiguration>(configuration);
services.AddLogging(builder => builder.SetMinimumLevel(LogLevel.Error).AddConsole());

IServiceProvider serviceProvider = services.BuildServiceProvider();
Expand Down
6 changes: 3 additions & 3 deletions MemcachedTest/MemcachedTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion SampleWebApp/SampleWebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion SampleWebApp/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public Startup(IHostingEnvironment env)

public void ConfigureServices(IServiceCollection services)
{
services.AddEnyimMemcached(Configuration);
services.AddEnyimMemcached();
//services.AddEnyimMemcached(Configuration);
//services.AddEnyimMemcached(Configuration, "enyimMemcached");
//services.AddEnyimMemcached(Configuration.GetSection("enyimMemcached"));
}
Expand Down
14 changes: 0 additions & 14 deletions SampleWebApp/web.config
View file
Open in desktop

This file was deleted.