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

all logs send to elastic

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-09-27 11:47:04 +10:00
parent 00f5d9102a
commit 3bdbf2be57
9 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj
View File

@@ -9,6 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />

10
PARR.EsppTemplateSyncWorker/Program.cs
View File

@@ -1,3 +1,4 @@
using Elastic.CommonSchema.Serilog;
using PARR.EsppTemplateSync;
using PARR.EsppTemplateSyncWorker;
using Serilog;
@@ -11,9 +12,12 @@ IHost host = Host.CreateDefaultBuilder(args)
})
.UseSerilog((hostContext, services, config) =>
{
config
.WriteTo.Console()
.ReadFrom.Configuration(hostContext.Configuration);
if (hostContext.HostingEnvironment.IsProduction())
config.WriteTo.Console(new EcsTextFormatter());
else
config.WriteTo.Console();
config.ReadFrom.Configuration(hostContext.Configuration);
})
.Build();

1
PARR.GeneratorTemplatesWorker/PARR.GeneratorTemplatesWorker.csproj
View File

@@ -9,6 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />

55
PARR.GeneratorTemplatesWorker/Program.cs
View File

@@ -1,18 +1,24 @@
using Elastic.CommonSchema.Serilog;
using PARR.GeneratorTemplates;
using PARR.GeneratorTemplatesWorker;
using Serilog;
var builder = Host.CreateApplicationBuilder();
builder.Services.AddLogging(config =>
{
config.ClearProviders();
var logger = new LoggerConfiguration()
.WriteTo.Console()
.ReadFrom.Configuration(builder.Configuration)
.CreateLogger();
config.AddSerilog(logger);
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.InstallGeneratorTemplateServices(builder.Configuration);
@@ -23,40 +29,3 @@ builder.Services.AddHostedService<Worker>();
var host = builder.Build();
host.Run();
//IHost host = Host.CreateDefaultBuilder(args)
// .ConfigureServices((hostContext, services) =>
// {
// services.InstallGeneratorTemplateServices(hostContext.Configuration);
// //hostContext.Configuration.AddGeneratorTemplateConfigurations(services);
// //services.AddGeneratorTemplateSettings(hostContext.Configuration);
// //services.AddHostedService<Worker>();
// })
// .ConfigureAppConfiguration((hostContext, configBuilder) =>
// {
// //TODO: !!!!!!!!!не смог прикрутить AddGeneratorTemplateConfigurations, не могу прокинуть туда сервисы
// configBuilder.AddGeneratorTemplateConfigurations(hostContext.Services);
// })
// .ConfigureServices((hostContext, services) =>
// {
// services.AddGeneratorTemplateSettings(hostContext.Configuration);
// services.AddHostedService<Worker>();
// })
// .UseSerilog((hostContext, services, config) =>
// {
// config
// .WriteTo.Console()
// .ReadFrom.Configuration(hostContext.Configuration);
// })
// .Build();
//host.Run();

1
PARR.Worker/PARR.Worker/PARR.AIHITWorker.csproj
View File

@@ -10,6 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />

10
PARR.Worker/PARR.Worker/Program.cs
View File

@@ -1,3 +1,4 @@
using Elastic.CommonSchema.Serilog;
using PARR.AIHIT;
using PARR.Worker;
using PARR.Worker.Settings;
@@ -20,9 +21,12 @@ IHost host = Host.CreateDefaultBuilder(args)
})
.UseSerilog((hostContext, services, config) =>
{
config
.WriteTo.Console()
.ReadFrom.Configuration(hostContext.Configuration);
if (hostContext.HostingEnvironment.IsProduction())
config.WriteTo.Console(new EcsTextFormatter());
else
config.WriteTo.Console();
config.ReadFrom.Configuration(hostContext.Configuration);
})
.Build();

5
docker-compose.aihit-syncher.yml
View File

@@ -11,6 +11,11 @@ services:
- TZ=Europe/Moscow
volumes:
- /var/log/parr-aihit-syncher:/app/log
logging:
river: fluentd
options:
fluentd-address: dvgd-mng-02.dvgd.oao.rzd:24224
tag: parr.aihit-syncher.serilog
# последняя версия

5
docker-compose.espp-template-sync.yml
View File

@@ -13,6 +13,11 @@ services:
#volumes:
#- /var/log/parr-espp-template-sync:/app/log
#- parr_storage_dev:/app/Data
logging:
river: fluentd
options:
fluentd-address: dvgd-mng-02.dvgd.oao.rzd:24224
tag: parr.espp-template-sync.serilog
deploy:
replicas: 4

5
docker-compose.generator-templates.yml
View File

@@ -7,5 +7,10 @@ services:
environment:
- ASPNETCORE_ENVIRONMENT=Production
- TZ=Europe/Moscow
logging:
river: fluentd
options:
fluentd-address: dvgd-mng-02.dvgd.oao.rzd:24224
tag: parr.generator-templates.serilog
deploy:
replicas: 1