From e59e72f6d6774facd82cab01f97e0fefb54ec01e Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Wed, 20 Aug 2025 15:25:26 +1000 Subject: [PATCH] fix(templateGeneratorWorker): MqSettings --- .../MqTemplateDistributor.cs | 1 - .../Settings/MqSettings.cs | 3 ++- PARR.TemplateGeneratorWorker/Worker.cs | 22 +++++-------------- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/PARR.TemplateDistributor/MqTemplateDistributor.cs b/PARR.TemplateDistributor/MqTemplateDistributor.cs index 7e88735d..edf40137 100644 --- a/PARR.TemplateDistributor/MqTemplateDistributor.cs +++ b/PARR.TemplateDistributor/MqTemplateDistributor.cs @@ -4,7 +4,6 @@ using PARR.BLL.Domain.Mq; using PARR.BLL.Services.Interfaces; using PARR.TemplateDistributor.Services; using PARR.TemplateDistributor.Settings; -using System.Threading.Tasks; namespace PARR.TemplateDistributor { diff --git a/PARR.TemplateGeneratorWorker/Settings/MqSettings.cs b/PARR.TemplateGeneratorWorker/Settings/MqSettings.cs index 652588ab..4125436a 100644 --- a/PARR.TemplateGeneratorWorker/Settings/MqSettings.cs +++ b/PARR.TemplateGeneratorWorker/Settings/MqSettings.cs @@ -2,11 +2,12 @@ namespace PARR.TemplateGeneratorWorker.Settings { - public class MqSettings : IMqSettings//TODO почему-то только публик работает + public class MqSettings : IMqSettings { public string HostName { get; set; } = string.Empty; public string QueueName { get; set; } = string.Empty; public string User { get; set; } = string.Empty; public string Password { get; set; } = string.Empty; + public ushort? PrefetchCount { get; set; } = 0; } } diff --git a/PARR.TemplateGeneratorWorker/Worker.cs b/PARR.TemplateGeneratorWorker/Worker.cs index 3f26262a..e1d40441 100644 --- a/PARR.TemplateGeneratorWorker/Worker.cs +++ b/PARR.TemplateGeneratorWorker/Worker.cs @@ -1,33 +1,21 @@ -using PARR.BLL.Contracts.Interfaces; using PARR.BLL.Services.Interfaces; -using PARR.DAL.DomainServices.Interfaces; -using PARR.DAL.Services.Interfaces; -using PARR.DAL.Services.Interfaces.Job; -using PARR.TemplateGeneratorWorker.Services; using PARR.TemplateGeneratorWorker.Settings; namespace PARR.TemplateGeneratorWorker { public class Worker : BackgroundService { - private readonly ILogger logger; - private readonly IMqSettings mqSettings; + + private readonly MqSettings mqSettings; private readonly IMqService mqService; private readonly IServiceProvider serviceProvider; - private readonly ITransformService transformService; - private readonly IValidatorService validatorService; - private readonly IJobService jobService; - private readonly IShortcodesService shortcodesService; - private readonly ITemplateService templateService; public Worker( - ILogger logger, MqSettings mqSettings, IMqService mqService, IServiceProvider serviceProvider ) { - this.logger = logger; this.mqSettings = mqSettings; this.mqService = mqService; this.serviceProvider = serviceProvider; @@ -35,10 +23,10 @@ namespace PARR.TemplateGeneratorWorker protected override async Task ExecuteAsync(CancellationToken stoppingToken) { - var isConnected = await mqService.InitConsumerAsync(mqSettings, GenerateTemplateAsync); + var isConnected = await mqService.InitConsumerAsync(mqSettings, GenerateTemplateAsync); - if (!isConnected) - throw new Exception("Îøèáêà ïðè ïîäêëþ÷åíèè ê RabbitMq"); + if (!isConnected) + throw new Exception("Îøèáêà ïðè ïîäêëþ÷åíèè ê RabbitMq"); }