Browse Source

Merge branch 'master' of https://github.com/dotnetcore/CAP

master
Savorboard 5 years ago
parent
commit
04fbca02e1
4 changed files with 16 additions and 30 deletions
  1. +3
    -3
      src/DotNetCore.CAP.AzureServiceBus/AzureServiceBusConsumerClient.cs
  2. +0
    -1
      src/DotNetCore.CAP.Kafka/CAP.KafkaOptions.cs
  3. +9
    -20
      src/DotNetCore.CAP.RabbitMQ/CAP.RabbiMQOptions.cs
  4. +4
    -6
      src/DotNetCore.CAP.RabbitMQ/IConnectionChannelPool.Default.cs

+ 3
- 3
src/DotNetCore.CAP.AzureServiceBus/AzureServiceBusConsumerClient.cs View File

@@ -154,9 +154,9 @@ namespace DotNetCore.CAP.AzureServiceBus
{ {
var context = args.ExceptionReceivedContext; var context = args.ExceptionReceivedContext;
var exceptionMessage = var exceptionMessage =
$"- Endpoint: {context.Endpoint}\r\n" +
$"- Entity Path: {context.EntityPath}\r\n" +
$"- Executing Action: {context.Action}\r\n" +
$"- Endpoint: {context.Endpoint}" + Environment.NewLine +
$"- Entity Path: {context.EntityPath}" + Environment.NewLine +
$"- Executing Action: {context.Action}" + Environment.NewLine +
$"- Exception: {args.Exception}"; $"- Exception: {args.Exception}";


var logArgs = new LogMessageEventArgs var logArgs = new LogMessageEventArgs


+ 0
- 1
src/DotNetCore.CAP.Kafka/CAP.KafkaOptions.cs View File

@@ -54,7 +54,6 @@ namespace DotNetCore.CAP


MainConfig["bootstrap.servers"] = Servers; MainConfig["bootstrap.servers"] = Servers;
MainConfig["queue.buffering.max.ms"] = "10"; MainConfig["queue.buffering.max.ms"] = "10";
MainConfig["socket.blocking.max.ms"] = "10";
MainConfig["enable.auto.commit"] = "false"; MainConfig["enable.auto.commit"] = "false";
MainConfig["log.connection.close"] = "false"; MainConfig["log.connection.close"] = "false";
MainConfig["request.timeout.ms"] = "3000"; MainConfig["request.timeout.ms"] = "3000";


+ 9
- 20
src/DotNetCore.CAP.RabbitMQ/CAP.RabbiMQOptions.cs View File

@@ -2,15 +2,14 @@
// Licensed under the MIT License. See License.txt in the project root for license information. // Licensed under the MIT License. See License.txt in the project root for license information.


// ReSharper disable once CheckNamespace // ReSharper disable once CheckNamespace

using System;
using RabbitMQ.Client;

namespace DotNetCore.CAP namespace DotNetCore.CAP
{ {
public class RabbitMQOptions public class RabbitMQOptions
{ {
/// <summary>
/// Default value for connection attempt timeout, in milliseconds.
/// </summary>
public const int DefaultConnectionTimeout = 30 * 1000;

/// <summary> /// <summary>
/// Default password (value: "guest"). /// Default password (value: "guest").
/// </summary> /// </summary>
@@ -63,21 +62,6 @@ namespace DotNetCore.CAP
/// </summary> /// </summary>
public string ExchangeName { get; set; } = DefaultExchangeName; public string ExchangeName { get; set; } = DefaultExchangeName;


/// <summary>
/// Timeout setting for connection attempts (in milliseconds).
/// </summary>
public int RequestedConnectionTimeout { get; set; } = DefaultConnectionTimeout;

/// <summary>
/// Timeout setting for socket read operations (in milliseconds).
/// </summary>
public int SocketReadTimeout { get; set; } = DefaultConnectionTimeout;

/// <summary>
/// Timeout setting for socket write operations (in milliseconds).
/// </summary>
public int SocketWriteTimeout { get; set; } = DefaultConnectionTimeout;

/// <summary> /// <summary>
/// The port to connect on. /// The port to connect on.
/// </summary> /// </summary>
@@ -87,5 +71,10 @@ namespace DotNetCore.CAP
/// Gets or sets queue message automatic deletion time (in milliseconds). Default 864000000 ms (10 days). /// Gets or sets queue message automatic deletion time (in milliseconds). Default 864000000 ms (10 days).
/// </summary> /// </summary>
public int QueueMessageExpires { get; set; } = 864000000; public int QueueMessageExpires { get; set; } = 864000000;

/// <summary>
/// RabbitMQ native connection factory options
/// </summary>
public Action<ConnectionFactory> ConnectionFactoryOptions { get; set; }
} }
} }

+ 4
- 6
src/DotNetCore.CAP.RabbitMQ/IConnectionChannelPool.Default.cs View File

@@ -6,7 +6,6 @@ using System.Collections.Concurrent;
using System.Diagnostics; using System.Diagnostics;
using System.Threading; using System.Threading;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using RabbitMQ.Client; using RabbitMQ.Client;


namespace DotNetCore.CAP.RabbitMQ namespace DotNetCore.CAP.RabbitMQ
@@ -43,7 +42,7 @@ namespace DotNetCore.CAP.RabbitMQ
Exchange = options.ExchangeName + "." + capOptions.Version; Exchange = options.ExchangeName + "." + capOptions.Version;
} }


_logger.LogDebug("RabbitMQ configuration of CAP :\r\n {0}", JsonConvert.SerializeObject(options, Formatting.Indented));
_logger.LogDebug($"RabbitMQ configuration:'HostName:{options.HostName}, Port:{options.Port}, UserName:{options.UserName}, Password:{options.Password}, ExchangeName:{options.ExchangeName}'");
} }


IModel IConnectionChannelPool.Rent() IModel IConnectionChannelPool.Rent()
@@ -96,19 +95,18 @@ namespace DotNetCore.CAP.RabbitMQ
UserName = options.UserName, UserName = options.UserName,
Port = options.Port, Port = options.Port,
Password = options.Password, Password = options.Password,
VirtualHost = options.VirtualHost,
RequestedConnectionTimeout = options.RequestedConnectionTimeout,
SocketReadTimeout = options.SocketReadTimeout,
SocketWriteTimeout = options.SocketWriteTimeout
VirtualHost = options.VirtualHost
}; };


if (options.HostName.Contains(",")) if (options.HostName.Contains(","))
{ {
options.ConnectionFactoryOptions?.Invoke(factory);
return () => factory.CreateConnection( return () => factory.CreateConnection(
options.HostName.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)); options.HostName.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries));
} }


factory.HostName = options.HostName; factory.HostName = options.HostName;
options.ConnectionFactoryOptions?.Invoke(factory);
return () => factory.CreateConnection(); return () => factory.CreateConnection();
} }




Loading…
Cancel
Save