Commit 9fd0e373 authored by Savorboard's avatar Savorboard

Add service name to RabbitMQ connection alias name

parent a02ccc7f
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Diagnostics; using System.Diagnostics;
using System.Reflection;
using System.Threading; using System.Threading;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using RabbitMQ.Client; using RabbitMQ.Client;
...@@ -90,6 +91,8 @@ namespace DotNetCore.CAP.RabbitMQ ...@@ -90,6 +91,8 @@ namespace DotNetCore.CAP.RabbitMQ
private static Func<IConnection> CreateConnection(RabbitMQOptions options) private static Func<IConnection> CreateConnection(RabbitMQOptions options)
{ {
var serviceName = Assembly.GetEntryAssembly()?.GetName().Name.ToLower();
var factory = new ConnectionFactory var factory = new ConnectionFactory
{ {
UserName = options.UserName, UserName = options.UserName,
...@@ -97,17 +100,17 @@ namespace DotNetCore.CAP.RabbitMQ ...@@ -97,17 +100,17 @@ namespace DotNetCore.CAP.RabbitMQ
Password = options.Password, Password = options.Password,
VirtualHost = options.VirtualHost VirtualHost = options.VirtualHost
}; };
if (options.HostName.Contains(",")) if (options.HostName.Contains(","))
{ {
options.ConnectionFactoryOptions?.Invoke(factory); options.ConnectionFactoryOptions?.Invoke(factory);
return () => factory.CreateConnection( return () => factory.CreateConnection(
options.HostName.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)); options.HostName.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries), serviceName);
} }
factory.HostName = options.HostName; factory.HostName = options.HostName;
options.ConnectionFactoryOptions?.Invoke(factory); options.ConnectionFactoryOptions?.Invoke(factory);
return () => factory.CreateConnection(); return () => factory.CreateConnection(serviceName);
} }
private void RabbitMQ_ConnectionShutdown(object sender, ShutdownEventArgs e) private void RabbitMQ_ConnectionShutdown(object sender, ShutdownEventArgs e)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment