Skip to content

Commit 516145b

Browse files
committed
Tweak services.AddEnyimMemcached() and app.UseEnyimMemcached()
1 parent e8a40ec commit 516145b

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

Enyim.Caching/EnyimMemcachedApplicationBuilderExtensions.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,27 @@
55
using System.Threading.Tasks;
66
using Microsoft.Extensions.DependencyInjection;
77
using Microsoft.Extensions.Logging;
8+
using Enyim.Caching.Configuration;
9+
using Enyim.Caching.Memcached;
810

911
namespace Microsoft.AspNetCore.Builder
1012
{
1113
public static class EnyimMemcachedApplicationBuilderExtensions
1214
{
1315
public static IApplicationBuilder UseEnyimMemcached(this IApplicationBuilder app)
1416
{
17+
var logger = app.ApplicationServices.GetService<ILogger<IMemcachedClient>>();
1518
try
1619
{
17-
app.ApplicationServices.GetService<IMemcachedClient>()
18-
.GetAsync<string>("EnyimMemcached").Wait();
19-
Console.WriteLine("EnyimMemcached Started.");
20-
} catch (Exception ex)
20+
var client = app.ApplicationServices.GetRequiredService<IMemcachedClient>();
21+
client.GetValueAsync<string>("UseEnyimMemcached").Wait();
22+
Console.WriteLine("EnyimMemcached connected memcached servers.");
23+
}
24+
catch (Exception ex)
2125
{
22-
app.ApplicationServices.GetService<ILogger<IMemcachedClient>>()
23-
.LogError(new EventId(), ex, "EnyimMemcached Failed.");
26+
logger.LogError(ex, "Failed in UseEnyimMemcached");
2427
}
28+
2529
return app;
2630
}
2731
}

Enyim.Caching/EnyimMemcachedServiceCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private static IServiceCollection AddEnyimMemcachedInternal(IServiceCollection s
8686
services.TryAddSingleton<ITranscoder, DefaultTranscoder>();
8787
services.TryAddSingleton<IMemcachedKeyTransformer, DefaultKeyTransformer>();
8888
services.TryAddTransient<IMemcachedClientConfiguration, MemcachedClientConfiguration>();
89-
services.AddSingleton<MemcachedClient, MemcachedClient>();
89+
services.AddSingleton<MemcachedClient>();
9090

9191
services.AddSingleton<IMemcachedClient>(factory => factory.GetService<MemcachedClient>());
9292
services.AddSingleton<IDistributedCache>(factory => factory.GetService<MemcachedClient>());

0 commit comments

Comments
 (0)