mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(api, allLogs): в TemplateResponse добавлен TemplateStatusType. Шаблоны можно фильтровать по statusType. При изменении маски имени шаблона в Job, отправляется задание в очередь на переименование связанных шаблонов. Во всех проектах перенастроены логи, в проде, не пишутся логи внутрь контейнера, только в stdout.

Browse Source
This commit is contained in:
Mikhail Trubnikov
2025-12-02 09:49:08 +10:00
parent 33bcd59761
commit bebbfab317
46 changed files with 472 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PARR.AIHITRelationshipsSyncerWorker/appsettings.Development.json
View File

@@ -6,6 +6,15 @@
"Microsoft": "Debug",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
}
}

9
PARR.AIHITRelationshipsSyncerWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"WorkerSettings": {
"RepeatEvery": "12:00:00",

9
PARR.AIHITSyncerWorker/appsettings.Development.json
View File

@@ -6,7 +6,16 @@
//"Microsoft": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "10.99.253.216"

9
PARR.AIHITSyncerWorker/appsettings.json
View File

@@ -15,16 +15,7 @@
"Microsoft": "Warning",
"Microsoft.EntityFrameworkCore.Database.Command": "Warning"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"WorkerSettings": {
"RepeatEvery": "00:10:00"

5
PARR.API/Contracts/V1/ApiRoutes.cs
View File

@@ -75,6 +75,11 @@
public const string getParam = "{id}";
}
public static class TemplateStatusType
{
public const string GetAll = Base + "/template-status-types/";
}
public static class TemplateHistory
{
public const string GetAll = Base + "/template-histories/";

9
PARR.API/Contracts/V1/Requests/Queries/TemplateQuery.cs
View File

@@ -1,4 +1,6 @@
namespace PARR.API.Contracts.V1.Requests.Queries
using PARR.Constants;
namespace PARR.API.Contracts.V1.Requests.Queries
{
public class TemplateQuery
{
@@ -17,5 +19,10 @@
/// Поиск по ИД Задания (JobId)
/// </summary>
public Guid? JobId { get; set; }
/// <summary>
/// StatusType
/// </summary>
public TemplateStatusTypeEnum? StatusTypeId { get; set; }
}
}

2
PARR.API/Contracts/V1/Responses/TemplateResponse.cs
View File

@@ -51,5 +51,7 @@
public EsppScheduleResponse? Schedule { get; set; }
public int OrderCount { get; set; }
public TemplateStatusTypeResponse? StatusType { get; set; }
}
}

11
PARR.API/Contracts/V1/Responses/TemplateStatusTypeResponse.cs Normal file
View File

@@ -0,0 +1,11 @@
namespace PARR.API.Contracts.V1.Responses
{
public class TemplateStatusTypeResponse
{
public int Id { get; set; }
public required string Name { get; set; }
public required string Description { get; set; }
}
}

3
PARR.API/Controllers/V1/GeneratorTemplateController.cs
View File

@@ -39,6 +39,9 @@ namespace PARR.API.Controllers.V1
this.clientService = clientService;
}
/// !!!!!!!!!! Это старый контроллер, удалить !!!!!!!!!!
/// <summary>
/// Запрос на генерацию шаблонов
/// </summary>

62
PARR.API/Controllers/V1/JobController.cs
View File

@@ -11,6 +11,10 @@ using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Controllers.V1.Base;
using PARR.API.Extensions;
using PARR.API.Services.Interfaces;
using PARR.API.Settings;
using PARR.BLL.Domain.Mq;
using PARR.BLL.Services.Interfaces;
using PARR.Common.Domain;
using PARR.Constants;
using PARR.DAL.Contracts;
using PARR.DAL.DomainModels;
@@ -19,6 +23,7 @@ using PARR.DAL.Models.Job;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Job;
using PARR.DAL.Services.Interfaces.Unit;
using System.Text.Json;
namespace PARR.API.Controllers.V1
{
@@ -34,6 +39,9 @@ namespace PARR.API.Controllers.V1
private readonly IJobService jobService;
private readonly ITemplateService templateService;
private readonly IValidator<JobRequest> jobValidator;
private readonly IMqService mqService;
private readonly MqSettings mqSettings;
private readonly IClientService clientService;
public JobController(
ILogger<JobController> logger,
@@ -44,7 +52,10 @@ namespace PARR.API.Controllers.V1
IJobGroupService jobGroupService,
IValidator<JobRequest> jobValidator,
IUnitFilterService unitFilterService,
IUnitService unitService
IUnitService unitService,
IMqService mqService,
MqSettings mqSettings,
IClientService clientService
)
{
this.logger = logger;
@@ -53,6 +64,9 @@ namespace PARR.API.Controllers.V1
this.jobService = jobService;
this.templateService = templateService;
this.jobValidator = jobValidator;
this.mqService = mqService;
this.mqSettings = mqSettings;
this.clientService = clientService;
}
/// <summary>
@@ -225,7 +239,13 @@ namespace PARR.API.Controllers.V1
if (orig == null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при изменении задания на выполнение работ. Не найдено задание с Id: {id}" } }));
// если изменили маску шаблона, ниже отправим в очередь, на изменение связанных имен шаблонов
var isChangedTemplateNameMask = orig.TemplateNameMask != request.TemplateNameMask.Trim();
#region обновление полей задания на работу
//TODO: ниже if-ы какая то странная история. зачем if-ы, просто приравниваем сразу и все...
var changed = false;
if (orig.Name != request.Name.Trim())
@@ -294,6 +314,13 @@ namespace PARR.API.Controllers.V1
if (!await jobService.CommitAsync())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при изменении задания на выполнение работ." } }));
// если изменили маску, отправим задание на переименование связанных шаблонов
if (isChangedTemplateNameMask)
{
var mqResult = await SendRequestToUpdateTemplates(id);
//todo: если ошибка. пользователя не предупреждаем... возможно ему это и не нужно знать...ну не переименуются шаблоны, может они переименуются позже...
}
logger.LogInformation($"Пользователь {User.Identity?.Name} обновил задание на выполнение работ: {orig.Id}," +
$" {orig.Name}, {orig.WorkName}, {orig.MinValueRelationships}, {orig.MaxValueRelationships}," +
$" {orig.TemplateNameMask}, {orig.TnkId}, {nameof(orig.GroupId)}");
@@ -556,12 +583,45 @@ namespace PARR.API.Controllers.V1
};
}
private void BindStatistics(JobResponse job, JobStatModel statistics)
{
//job.TemplateStatistics = new TemplateStats { Activated = statistics.TemplateStatistics.Activated, Errors = statistics.TemplateStatistics.Errors, Synchronized = statistics.TemplateStatistics.Synchronized };
//job.ScheduleStatistics = new ScheduleStats { Activated = statistics.ScheduleStatistics.Activated, Errors = statistics.ScheduleStatistics.Errors, Synchronized = statistics.ScheduleStatistics.Synchronized };
}
private async Task<bool> SendRequestToUpdateTemplates(Guid jobId)
{
var request = new TemplateMatcherMq
{
Id = jobId,
EntityType = SyncTaskEntityTypeEnum.Job,
Action = TemplateMatcherActionEnum.Update,
Initiator = new HistoryInitiator
{
InitiatorIp = clientService.GetClientIp()?.ToString(),
InitiatorParrComponentId = ParrComponentsEnum.Api,
InitiatorComment = $"В GUI изменено имя шаблона, при сохранении Job отправлен запрос на обновление связанных шаблонов"
}
};
var msg = JsonSerializer.Serialize(request);
var result = await mqService.SendAsync(mqSettings.TemplatesMatcher, new[] { msg });
logger.LogDebug("Получен код отпрвки: {IsSuccess}", result.IsSuccess);
if (!result.IsSuccess)
{
logger.LogError($"Ошибка при отправке запроса в очередь на обновление связанных шаблонов, после обновления маски шаблона. {msg}");
return false;
}
logger.LogInformation($"После изменения маски шаблона в jobId: {jobId}, отправлен запрос в очередь на переименование связанных шаблонов: {msg}");
return true;
}
}

1
PARR.API/Controllers/V1/SyncTaskController.cs
View File

@@ -40,7 +40,6 @@ namespace PARR.API.Controllers.V1
/// <summary>
/// Сопоставить текущие шаблоны для Job, создать недостущие шаблоны
/// </summary>
/// <param name="id">ИД шаблона</param>
[HttpPost(ApiRoutes.SyncTask.MatchTemplatesForJob)]
public async Task<IActionResult> MatchTemplatesForJob([FromRoute] Guid jobId, [FromBody] MatchTemplatesForJobRequest request)
{

7
PARR.API/Controllers/V1/TemplateController.cs
View File

@@ -62,6 +62,7 @@ namespace PARR.API.Controllers.V1
.Include(t => t.RobotConfigurations).ThenInclude(t => t.TaskStatus)
.Include(t => t.RobotConfigurations).ThenInclude(t => t.RobotStatus)
.Include(t => t.Orders)
.Include(t => t.StatusType)
.OrderBy(t => t.Name)
.AsSplitQuery();
@@ -72,6 +73,9 @@ namespace PARR.API.Controllers.V1
if (filter.JobId.HasValue)
query = query.Where(t => t.JobId == filter.JobId);
if (filter.StatusTypeId.HasValue)
query = query.Where(t => t.StatusTypeId == filter.StatusTypeId);
var templates = await templateService.GetPage(query, paginationFilter).ToListAsync();
if (!templates.Any())
@@ -98,6 +102,7 @@ namespace PARR.API.Controllers.V1
.Include(t => t.RobotConfigurations).ThenInclude(t => t.TaskStatus)
.Include(t => t.RobotConfigurations).ThenInclude(t => t.RobotStatus)
.Include(t => t.Orders)
.Include(t => t.StatusType)
.AsSplitQuery()
.FirstOrDefaultAsync(t => t.Id == id);
@@ -128,6 +133,7 @@ namespace PARR.API.Controllers.V1
.Include(t => t.RobotConfigurations).ThenInclude(t => t.TaskStatus)
.Include(t => t.RobotConfigurations).ThenInclude(t => t.RobotStatus)
.Include(t => t.Orders)
.Include(t => t.StatusType)
.AsSplitQuery()
.FirstOrDefaultAsync(t => t.Id == id);
@@ -160,6 +166,7 @@ namespace PARR.API.Controllers.V1
.Include(t => t.RobotConfigurations).ThenInclude(t => t.TaskStatus)
.Include(t => t.RobotConfigurations).ThenInclude(t => t.RobotStatus)
.Include(t => t.Orders)
.Include(t => t.StatusType)
.AsSplitQuery()
.FirstOrDefaultAsync(t => t.Id == id);

50
PARR.API/Controllers/V1/TemplateStatusTypeController.cs Normal file
View File

@@ -0,0 +1,50 @@
using AutoMapper;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Responses;
using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Controllers.V1.Base;
using PARR.Constants;
using PARR.DAL.Services.Interfaces;
namespace PARR.API.Controllers.V1
{
/// <summary>
/// Типы статусов шаблонов
/// </summary>
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class TemplateStatusTypeController : BaseApiController
{
private readonly IMapper mapper;
private readonly ITemplateStatusTypeService templateStatusTypeService;
public TemplateStatusTypeController(
IMapper mapper,
ITemplateStatusTypeService templateStatusTypeService
)
{
this.mapper = mapper;
this.templateStatusTypeService = templateStatusTypeService;
}
/// <summary>
/// Типы статусов шаблонов
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.TemplateStatusType.GetAll)]
public async Task<IActionResult> GetAll()
{
var statusTypes = await templateStatusTypeService.Get().OrderBy(t => t.Description).ToListAsync();
if (!statusTypes.Any())
return NoContent();
var response = mapper.Map<List<TemplateStatusTypeResponse>>(statusTypes);
return Ok(new Response<List<TemplateStatusTypeResponse>>(response, true));
}
}
}

9
PARR.API/MappingProfiles/DomainToResponseProfile.cs
View File

@@ -38,7 +38,8 @@ namespace PARR.API.MappingProfiles
.ForMember(d => d.NextRun, o => o.MapFrom(s => s.NextRun))
.ForMember(d => d.LastRun, o => o.MapFrom(s => s.LastRun))
.ForMember(d => d.OrderCount, o => o.MapFrom(s => s.Orders.Count()))
.ForMember(d => d.IsAutoDistributionEnabled, o => o.MapFrom(s => s.Job!.Group!.IsAutoDistributionEnabled));
.ForMember(d => d.IsAutoDistributionEnabled, o => o.MapFrom(s => s.Job!.Group!.IsAutoDistributionEnabled))
.ForMember(d => d.StatusType, o => o.MapFrom(s => s.StatusType));
// === Template ===
@@ -55,6 +56,12 @@ namespace PARR.API.MappingProfiles
CreateMap<DAL.Models.TaskStatus, TaskStatusResponse>();
#region StatusTypeResponse
CreateMap<TemplateStatusType, TemplateStatusTypeResponse>();
#endregion
#region Tnk
CreateMap<Process, ProcessResponse>();

10
PARR.API/Settings/MqSettings.cs
View File

@@ -9,6 +9,7 @@ namespace PARR.API.Settings
public MqTemplateActivator TemplateActivator { get; set; } = new MqTemplateActivator();
public MqStatistics Statistics { get; set; } = new MqStatistics();
public MqTemplatesMatcher TemplatesMatcher { get; set; } = new MqTemplatesMatcher();
public MqTemplatesUpdater TemplatesUpdater { get; set; } = new MqTemplatesUpdater();
}
public class MqGenerateTemplates : IMqSettings
@@ -60,4 +61,13 @@ namespace PARR.API.Settings
public string Password { get; set; } = string.Empty;
public ushort? PrefetchCount { get; set; } = 0;
}
public class MqTemplatesUpdater : 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;
}
}

12
PARR.API/appsettings.Development.json
View File

@@ -15,7 +15,16 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"StorageSettings": {
"StoragePath": "W:\\"
@@ -33,6 +42,9 @@
"TemplatesMatcher": {
"HostName": "10.99.253.216"
},
"TemplatesUpdater": {
"HostName": "10.99.253.216"
},
"Statistics": {
"StatMqAuth": {
"HostName": "10.99.253.216"

15
PARR.API/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"AllowedHosts": "*",
"CorsSettings": {
@@ -63,6 +54,12 @@
"User": "template_matcher_writer",
"Password": "8ndd%BpP61Ias;ldk23CkvZM"
},
"TemplatesUpdater": {
"HostName": "parr-rabbitmq",
"QueueName": "parr-template-updater",
"User": "template_updater_writer",
"Password": "sjdhgfkJHGIUFDi14asd^12"
},
"Statistics": {
"StatMqAuth": {
"HostName": "parr-rabbitmq",

1
PARR.DAL/ParrDalInstaller.cs
View File

@@ -94,6 +94,7 @@ namespace PARR.DAL
services.AddTransient<IJobEkMaskService, JobEkMaskService>();
services.AddTransient<ITemplateHistoryService, TemplateHistoryService>();
services.AddTransient<IParrComponentService, ParrComponentService>();
services.AddTransient<ITemplateStatusTypeService, TemplateStatusTypeService>();
#region Unit

22
PARR.DAL/Services/Implementations/TemplateStatusTypeService.cs Normal file
View File

@@ -0,0 +1,22 @@
using PARR.DAL.Context;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
namespace PARR.DAL.Services.Implementations
{
internal class TemplateStatusTypeService : ITemplateStatusTypeService
{
private readonly DataContext dataContext;
public TemplateStatusTypeService(DataContext dataContext)
{
this.dataContext = dataContext;
}
public IQueryable<TemplateStatusType> Get()
{
return dataContext.TemplateStatusTypes;
}
}
}

9
PARR.DAL/Services/Interfaces/ITemplateStatusTypeService.cs Normal file
View File

@@ -0,0 +1,9 @@
using PARR.DAL.Models;
namespace PARR.DAL.Services.Interfaces
{
public interface ITemplateStatusTypeService
{
IQueryable<TemplateStatusType> Get();
}
}

18
PARR.EsppOrderLoaderWorker/appsettings.Development.json
View File

@@ -7,5 +7,23 @@
"Default": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
}
}

9
PARR.EsppOrderLoaderWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"WorkerSettings": {
"RepeatEvery": "1:00:00"

18
PARR.EsppOrderManagerWorker/appsettings.Development.json
View File

@@ -8,6 +8,24 @@
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "10.99.253.216"
}

9
PARR.EsppOrderManagerWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "parr-rabbitmq",

18
PARR.EsppScheduleSyncWorker/appsettings.Development.json
View File

@@ -8,6 +8,24 @@
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"GlobalSettings": {
"MqSettings": {
"HostName": "10.99.253.216"

9
PARR.EsppScheduleSyncWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"GlobalSettings": {
"MqSettings": {

9
PARR.EsppTemplateSyncWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"StorageSettings": {
"StoragePath": "Data",

18
PARR.GeneratorTemplatesWorker/appsettings.Development.json
View File

@@ -8,6 +8,24 @@
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "10.99.253.216"
}

9
PARR.GeneratorTemplatesWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "parr-rabbitmq",

18
PARR.JobAutoControlWorker/appsettings.Development.json
View File

@@ -8,6 +8,24 @@
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"Generator": {
"HostName": "10.99.253.216"

9
PARR.JobAutoControlWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"WorkerSettings": {
"RepeatEvery": "6:00:00"

18
PARR.MasterWorker/appsettings.Development.json
View File

@@ -8,6 +8,24 @@
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "10.99.253.216"
}

9
PARR.MasterWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "parr-rabbitmq",

18
PARR.NextRunWorker/appsettings.Development.json
View File

@@ -7,5 +7,23 @@
"Default": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
}
}

9
PARR.NextRunWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"WorkerSettings": {
"RepeatEvery": "0:50:00"

18
PARR.TemplateActivatorWorker/appsettings.Development.json
View File

@@ -8,6 +8,24 @@
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "10.99.253.216"
}

9
PARR.TemplateActivatorWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "parr-rabbitmq",

18
PARR.TemplateDistributorWorker/appsettings.Development.json
View File

@@ -8,6 +8,24 @@
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "10.99.253.216"
}

9
PARR.TemplateDistributorWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "parr-rabbitmq",

18
PARR.TemplateGeneratorWorker/appsettings.Development.json
View File

@@ -8,6 +8,24 @@
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "10.99.253.216"
}

9
PARR.TemplateGeneratorWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"HostName": "parr-rabbitmq",

9
PARR.TemplateMatcherWorker/appsettings.Development.json
View File

@@ -6,7 +6,16 @@
"Microsoft": "Debug",
"Microsoft.Hosting.Lifetime": "Debug"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"TemplateMatcher": { "HostName": "10.99.253.216" },

9
PARR.TemplateMatcherWorker/appsettings.json
View File

@@ -10,16 +10,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"TemplateMatcher": {

18
PARR.TemplateTaskGeneratorWorker/appsettings.Development.json
View File

@@ -5,6 +5,24 @@
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"TemplateTaskGenerator": { "HostName": "10.99.253.216" },
"TemplateGeneratorWorker": { "HostName": "10.99.253.216" }

9
PARR.TemplateTaskGeneratorWorker/appsettings.json
View File

@@ -16,16 +16,7 @@
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"TemplateTaskGenerator": {

2
docker-compose.yml
View File

@@ -33,7 +33,7 @@ services:
retries: 3
start_period: 120s
deploy:
replicas: 4
replicas: 3
update_config:
parallelism: 1
delay: 5s