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
6 changes: 6 additions & 0 deletions bus/EasyCaching.Bus.Redis/Configurations/RedisBusOptions.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
namespace EasyCaching.Bus.Redis
{
using EasyCaching.Core.Configurations;
using StackExchange.Redis;

/// <summary>
/// Redis bus options.
Expand All @@ -17,5 +18,10 @@ public class RedisBusOptions : BaseRedisOptions
/// Gets or sets the serializer name that should be use in this bus.
/// </summary>
public string SerializerName { get; set; }

/// <summary>
/// Gets or sets the Redis database ConfigurationOptions will use.
/// </summary>
public ConfigurationOptions ConfigurationOptions { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ public ISubscriber GetSubscriber()
/// <returns>The connection multiplexer.</returns>
private ConnectionMultiplexer CreateConnectionMultiplexer()
{
if (_options.ConfigurationOptions != null)
return ConnectionMultiplexer.Connect(_options.ConfigurationOptions);

if (string.IsNullOrWhiteSpace(_options.Configuration))
{
var configurationOptions = new ConfigurationOptions
Expand All @@ -67,7 +70,7 @@ private ConnectionMultiplexer CreateConnectionMultiplexer()
configurationOptions.EndPoints.Add(endpoint.Host, endpoint.Port);
}

return ConnectionMultiplexer.Connect(configurationOptions.ToString());
return ConnectionMultiplexer.Connect(configurationOptions);
}
else
{
Expand Down
27 changes: 27 additions & 0 deletions test/EasyCaching.UnitTests/CachingTests/HybridCachingTest.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
namespace EasyCaching.UnitTests
{
using EasyCaching.Bus.Redis;
using EasyCaching.Core;
using EasyCaching.Core.Bus;
using EasyCaching.HybridCache;
using FakeItEasy;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Microsoft.VisualBasic.FileIO;
using StackExchange.Redis;
using System;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -148,6 +151,30 @@ public void Second_Client_Set_Same_Key_Should_Get_New_Value()
Assert.Equal("value", res.Value);
}

[Fact]
public void WithRedisBus_Use_Configuration_Options_Should_Succeed()
{
IServiceCollection services = new ServiceCollection();

var redisConfig = ConfigurationOptions.Parse("127.0.0.1:6379");
redisConfig.DefaultDatabase = 6;
services.AddEasyCaching(option =>
{
option.WithRedisBus(config =>
{
config.ConfigurationOptions = redisConfig;
config.SerializerName = "myredis";
});
});
IServiceProvider serviceProvider = services.BuildServiceProvider();
var dbProvider = serviceProvider.GetService<IRedisSubscriberProvider>();
Assert.NotNull(dbProvider);
var mul = dbProvider.GetSubscriber().Multiplexer;

Assert.Equal(6, mul.GetDatabase().Database);
}


[Fact]
public void Send_Msg_Throw_Exception_Should_Not_Break()
{
Expand Down