feat(jobAutoControl): логика управления авто-контролем

This commit is contained in:
Mikhail Trubnikov
2024-09-12 15:05:47 +10:00
parent 0b1c52422f
commit 1af76405e2
19 changed files with 451 additions and 38 deletions

View File

@@ -0,0 +1,28 @@
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base
WORKDIR /app
FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["NuGet.config", "."]
COPY ["PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj", "PARR.JobAutoControlWorker/"]
COPY ["PARR.JobAutoControl/PARR.JobAutoControl.csproj", "PARR.JobAutoControl/"]
COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
RUN dotnet restore "./PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj"
COPY . .
WORKDIR "/src/PARR.JobAutoControlWorker"
RUN dotnet build "./PARR.JobAutoControlWorker.csproj" -c $BUILD_CONFIGURATION -o /app/build
FROM build AS publish
ARG app_version=0.0.0-default
ARG BUILD_CONFIGURATION=Release
RUN dotnet publish "./PARR.JobAutoControlWorker.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false /p:Version=$app_version
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "PARR.JobAutoControlWorker.dll"]

View File

@@ -5,9 +5,20 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>dotnet-PARR.JobAutoControlWorker-50dc4ed1-928f-47c3-855e-137f03acd19c</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.11.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PARR.JobAutoControl\PARR.JobAutoControl.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,10 +1,38 @@
using Elastic.CommonSchema.Serilog;
using PARR.JobAutoControl;
using PARR.JobAutoControlWorker;
using Serilog;
IHost host = Host.CreateDefaultBuilder(args)
.ConfigureServices(services =>
{
services.AddHostedService<Worker>();
})
.Build();
var builder = Host.CreateApplicationBuilder();
builder.Services.AddLogging(config =>
{
config.ClearProviders();
var logger = new LoggerConfiguration();
if (builder.Environment.IsProduction())
logger.WriteTo.Console(new EcsTextFormatter());
else
logger.WriteTo.Console();
logger.ReadFrom.Configuration(builder.Configuration);
config.AddSerilog(logger.CreateLogger());
});
builder.Services.InstallJobAutoControlServices(builder.Configuration);
builder.Configuration.AddJobAutoControlConfigurations(builder.Services);
builder.Services.AddJobAutoControlSettings(builder.Configuration);
builder.Services.AddHostedService<Worker>();
var host = builder.Build();
host.Run();

View File

@@ -1,11 +1,14 @@
{
{
"profiles": {
"PARR.JobAutoControlWorker": {
"commandName": "Project",
"dotnetRunMessages": true,
"environmentVariables": {
"DOTNET_ENVIRONMENT": "Development"
}
},
"dotnetRunMessages": true
},
"Container (Dockerfile)": {
"commandName": "Docker"
}
}
}
}

View File

@@ -1,21 +1,19 @@
using PARR.JobAutoControl;
namespace PARR.JobAutoControlWorker
{
public class Worker : BackgroundService
{
private readonly ILogger<Worker> _logger;
private readonly IJobAutoControlManager jobAutoControlManager;
public Worker(ILogger<Worker> logger)
public Worker(IJobAutoControlManager jobAutoControlManager)
{
_logger = logger;
this.jobAutoControlManager = jobAutoControlManager;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
while (!stoppingToken.IsCancellationRequested)
{
_logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
await Task.Delay(1000, stoppingToken);
}
await jobAutoControlManager.StartAsync();
}
}
}

View File

@@ -4,5 +4,13 @@
"Default": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"MqSettings": {
"Generator": {
"HostName": "10.99.253.216"
},
"Activator": {
"HostName": "10.99.253.216"
}
}
}

View File

@@ -1,8 +1,46 @@
{
"ConnectionStrings": {
"DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;"
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Debug",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"WorkerSettings": {
"RepeatEvery": "6:00:00"
},
"MqSettings": {
"Generator": {
"HostName": "parr-rabbitmq",
"QueueName": "parr-generate-templates",
"User": "generate_templates_api",
"Password": "DHhjgdsf*&%95"
},
"Activator": {
"HostName": "parr-rabbitmq",
"QueueName": "parr-template-activator",
"User": "template_activator_writer",
"Password": "Gfkjhsdg*%fsdf"
}
}
}