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
4 changes: 2 additions & 2 deletions src/EasyCaching.HybridCache/HybridCachingProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ public class HybridCachingProvider : IHybridCachingProvider
/// <param name="bus">Bus.</param>
/// <param name="loggerFactory">Logger factory.</param>
public HybridCachingProvider(
HybridCachingOptions optionsAccs
IOptions<HybridCachingOptions> optionsAccs
, IEasyCachingProviderFactory factory
, IEasyCachingBus bus = null
, ILoggerFactory loggerFactory = null
)
{
ArgumentCheck.NotNull(factory, nameof(factory));

this._options = optionsAccs;
this._options = optionsAccs.Value;

ArgumentCheck.NotNullOrWhiteSpace(_options.TopicName, nameof(_options.TopicName));

Expand Down
33 changes: 15 additions & 18 deletions test/EasyCaching.UnitTests/CachingTests/HybridCachingTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
using EasyCaching.InMemory;
using EasyCaching.Redis;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using System;
using System.Threading.Tasks;
using Xunit;

public class HybridCachingTest //: BaseCachingProviderTest
{
private HybridCachingProvider hybridCaching_1;
private HybridCachingProvider hybridCaching_2;
private IHybridCachingProvider hybridCaching_1;
//private HybridCachingProvider hybridCaching_2;
private IEasyCachingProviderFactory factory;
private string _namespace;

Expand All @@ -33,33 +34,29 @@ public HybridCachingTest()
config.DBConfig.Database = 5;
}, "myredis");

option.UseHybrid(config =>
{
config.EnableLogging = false;
config.TopicName = "test_topic";
config.LocalCacheProviderName = "m1";
config.DistributedCacheProviderName = "myredis";
});

option.WithRedisBus(config =>
{
config.Endpoints.Add(new Core.Configurations.ServerEndPoint("127.0.0.1", 6379));
config.Database = 6;
});


});

IServiceProvider serviceProvider = services.BuildServiceProvider();
factory = serviceProvider.GetService<IEasyCachingProviderFactory>();

var bus = serviceProvider.GetService<IEasyCachingBus>();

hybridCaching_1 = new HybridCachingProvider(new HybridCachingOptions
{
EnableLogging = false,
TopicName = "test_topic",
LocalCacheProviderName = "m1",
DistributedCacheProviderName = "myredis"
}, factory, bus);

hybridCaching_2 = new HybridCachingProvider(new HybridCachingOptions
{
EnableLogging = false,
TopicName = "test_topic",
LocalCacheProviderName = "m2",
DistributedCacheProviderName = "myredis"
}, factory, bus);
hybridCaching_1 = serviceProvider.GetService<IHybridCachingProvider>();
}

[Fact]
Expand Down Expand Up @@ -122,7 +119,7 @@ public void Second_Client_Set_Same_Key_Should_Get_New_Value()

hybridCaching_1.Set(cacheKey, "val", TimeSpan.FromSeconds(30));

hybridCaching_2.Set(cacheKey, "value", TimeSpan.FromSeconds(30));
//hybridCaching_2.Set(cacheKey, "value", TimeSpan.FromSeconds(30));

//System.Threading.Thread.Sleep(5000);

Expand Down