diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/InboxProcessorOptions.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/AbpInboxProcessorOptions.cs similarity index 92% rename from framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/InboxProcessorOptions.cs rename to framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/AbpInboxProcessorOptions.cs index 7767945208..32b209a94d 100644 --- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/InboxProcessorOptions.cs +++ b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/AbpInboxProcessorOptions.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.EventBus.Distributed; -public class InboxProcessorOptions +public class AbpInboxProcessorOptions { public InboxProcessorFailurePolicy FailurePolicy { get; set; } = InboxProcessorFailurePolicy.Retry; diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/InboxProcessor.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/InboxProcessor.cs index 88f9e18a29..df137725b8 100644 --- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/InboxProcessor.cs +++ b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/InboxProcessor.cs @@ -25,7 +25,7 @@ public class InboxProcessor : IInboxProcessor, ITransientDependency protected IEventInbox Inbox { get; private set; } = default!; protected InboxConfig InboxConfig { get; private set; } = default!; protected AbpEventBusBoxesOptions EventBusBoxesOptions { get; } - protected InboxProcessorOptions InboxProcessorOptions { get; set; } + protected AbpInboxProcessorOptions AbpInboxProcessorOptions { get; set; } protected DateTime? LastCleanTime { get; set; } protected string DistributedLockName { get; set; } = default!; @@ -41,7 +41,7 @@ public class InboxProcessor : IInboxProcessor, ITransientDependency IUnitOfWorkManager unitOfWorkManager, IClock clock, IOptions eventBusBoxesOptions, - IOptions inboxProcessorOptions) + IOptions inboxProcessorOptions) { ServiceProvider = serviceProvider; Timer = timer; @@ -50,7 +50,7 @@ public class InboxProcessor : IInboxProcessor, ITransientDependency UnitOfWorkManager = unitOfWorkManager; Clock = clock; EventBusBoxesOptions = eventBusBoxesOptions.Value; - InboxProcessorOptions = inboxProcessorOptions.Value; + AbpInboxProcessorOptions = inboxProcessorOptions.Value; Timer.Period = Convert.ToInt32(EventBusBoxesOptions.PeriodTimeSpan.TotalMilliseconds); Timer.Elapsed += TimerOnElapsed; Logger = NullLogger.Instance; @@ -132,16 +132,16 @@ public class InboxProcessor : IInboxProcessor, ITransientDependency { Logger.LogError(e, $"An error occurred while processing the incoming event with id = {waitingEvent.Id:N}"); - if (InboxProcessorOptions.FailurePolicy == InboxProcessorFailurePolicy.Retry) + if (AbpInboxProcessorOptions.FailurePolicy == InboxProcessorFailurePolicy.Retry) { throw; } - if (InboxProcessorOptions.FailurePolicy == InboxProcessorFailurePolicy.RetryLater) + if (AbpInboxProcessorOptions.FailurePolicy == InboxProcessorFailurePolicy.RetryLater) { using (var uow = UnitOfWorkManager.Begin(isTransactional: true, requiresNew: true)) { - if (waitingEvent.RetryCount > InboxProcessorOptions.MaxRetryCount) + if (waitingEvent.RetryCount > AbpInboxProcessorOptions.MaxRetryCount) { Logger.LogWarning($"Max retry count reached for event with id = {waitingEvent.Id:N}. Discarding the event."); @@ -152,15 +152,15 @@ public class InboxProcessor : IInboxProcessor, ITransientDependency Logger.LogInformation($"Retrying event with id = {waitingEvent.Id:N}. " + $"Retry count: {waitingEvent.RetryCount}, " + - $"Next retry time: {GetNextRetryTime(waitingEvent.RetryCount, InboxProcessorOptions.MaxRetryCount)}"); + $"Next retry time: {GetNextRetryTime(waitingEvent.RetryCount, AbpInboxProcessorOptions.MaxRetryCount)}"); - await Inbox.RetryLaterAsync(waitingEvent.Id, waitingEvent.RetryCount++, GetNextRetryTime(waitingEvent.RetryCount, InboxProcessorOptions.MaxRetryCount)); + await Inbox.RetryLaterAsync(waitingEvent.Id, ++waitingEvent.RetryCount, GetNextRetryTime(waitingEvent.RetryCount, AbpInboxProcessorOptions.MaxRetryCount)); await uow.CompleteAsync(StoppingToken); } continue; } - if (InboxProcessorOptions.FailurePolicy == InboxProcessorFailurePolicy.Discard) + if (AbpInboxProcessorOptions.FailurePolicy == InboxProcessorFailurePolicy.Discard) { using (var uow = UnitOfWorkManager.Begin(isTransactional: true, requiresNew: true)) {