Commit e9c4e926 authored by yangxiaodong's avatar yangxiaodong

rename.

parent 73556221
...@@ -6,7 +6,6 @@ using System.Threading.Tasks; ...@@ -6,7 +6,6 @@ using System.Threading.Tasks;
using Cap.Consistency.Abstractions; using Cap.Consistency.Abstractions;
using Cap.Consistency.Infrastructure; using Cap.Consistency.Infrastructure;
using Cap.Consistency.Internal; using Cap.Consistency.Internal;
using Cap.Consistency.Store;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
...@@ -22,7 +21,7 @@ namespace Cap.Consistency.Consumer ...@@ -22,7 +21,7 @@ namespace Cap.Consistency.Consumer
private readonly MethodMatcherCache _selector; private readonly MethodMatcherCache _selector;
private readonly ConsistencyOptions _options; private readonly ConsistencyOptions _options;
private readonly ConsistencyMessageManager _messageManager; private readonly IConsistencyMessageStore _messageStore;
private readonly CancellationTokenSource _cts; private readonly CancellationTokenSource _cts;
public event EventHandler<ConsistencyMessage> MessageReceieved; public event EventHandler<ConsistencyMessage> MessageReceieved;
...@@ -36,7 +35,7 @@ namespace Cap.Consistency.Consumer ...@@ -36,7 +35,7 @@ namespace Cap.Consistency.Consumer
IConsumerInvokerFactory consumerInvokerFactory, IConsumerInvokerFactory consumerInvokerFactory,
IConsumerClientFactory consumerClientFactory, IConsumerClientFactory consumerClientFactory,
ILoggerFactory loggerFactory, ILoggerFactory loggerFactory,
ConsistencyMessageManager messageManager, IConsistencyMessageStore messageStore,
MethodMatcherCache selector, MethodMatcherCache selector,
IOptions<ConsistencyOptions> options) { IOptions<ConsistencyOptions> options) {
_selector = selector; _selector = selector;
...@@ -46,7 +45,7 @@ namespace Cap.Consistency.Consumer ...@@ -46,7 +45,7 @@ namespace Cap.Consistency.Consumer
_consumerInvokerFactory = consumerInvokerFactory; _consumerInvokerFactory = consumerInvokerFactory;
_consumerClientFactory = consumerClientFactory; _consumerClientFactory = consumerClientFactory;
_options = options.Value; _options = options.Value;
_messageManager = messageManager; _messageStore = messageStore;
_cts = new CancellationTokenSource(); _cts = new CancellationTokenSource();
} }
...@@ -72,20 +71,21 @@ namespace Cap.Consistency.Consumer ...@@ -72,20 +71,21 @@ namespace Cap.Consistency.Consumer
client.Listening(TimeSpan.FromSeconds(1)); client.Listening(TimeSpan.FromSeconds(1));
} }
}, TaskCreationOptions.LongRunning); }, _cts.Token, TaskCreationOptions.LongRunning, TaskScheduler.Current);
} }
_compositeTask = Task.CompletedTask; _compositeTask = Task.CompletedTask;
} }
public virtual void OnMessageReceieved(object sender, DeliverMessage message) { public virtual void OnMessageReceieved(object sender, DeliverMessage message) {
var consistencyMessage = new ConsistencyMessage() { var consistencyMessage = new ConsistencyMessage() {
Id = message.MessageKey, Topic = message.MessageKey,
Payload = Encoding.UTF8.GetString(message.Body) Payload = "Reveived:" + Encoding.UTF8.GetString(message.Body),
Status = MessageStatus.Received
}; };
_logger.LogInformation("message receieved message topic name: " + consistencyMessage.Id); _logger.LogInformation("message receieved message topic name: " + consistencyMessage.Id);
_messageManager.CreateAsync(consistencyMessage).Wait(); _messageStore.CreateAsync(consistencyMessage, _cts.Token).Wait();
try { try {
var executeDescriptor = _selector.GetTopicExector(message.MessageKey); var executeDescriptor = _selector.GetTopicExector(message.MessageKey);
...@@ -96,7 +96,7 @@ namespace Cap.Consistency.Consumer ...@@ -96,7 +96,7 @@ namespace Cap.Consistency.Consumer
invoker.InvokeAsync(); invoker.InvokeAsync();
_messageManager.UpdateAsync(consistencyMessage).Wait(); _messageStore.UpdateAsync(consistencyMessage, _cts.Token).Wait();
} }
catch (Exception ex) { catch (Exception ex) {
_logger.LogError("exception raised when excute method : " + ex.Message); _logger.LogError("exception raised when excute method : " + ex.Message);
......
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