AI/myAi
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Changes
Build and Push Docker Images / build (push) Successful in 5m57s
Details

Browse Source
This commit is contained in:
Gelu Mihes
2026-05-14 15:04:30 +03:00
parent 9da9ac232b
commit 1a790ed9b4
11 changed files with 229 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Helpers/startup-helpers/EnvironmentDiagnostics.cs
+26 -4
View File
@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
namespace StartupHelpers;
@@ -7,12 +8,33 @@ namespace StartupHelpers;
public static class EnvironmentDiagnostics
{
public static void LogEnvironmentSettings(ILogger logger, IConfiguration configuration, IWebHostEnvironment environment)
{
LogEnvironmentSettingsCore(logger, configuration, environment.ApplicationName, environment.EnvironmentName,
environment.ContentRootPath, environment.WebRootPath);
}
public static void LogEnvironmentSettings(ILogger logger, IConfiguration configuration, IHostEnvironment environment)
{
LogEnvironmentSettingsCore(logger, configuration, environment.ApplicationName, environment.EnvironmentName,
environment.ContentRootPath, webRootPath: null);
}
private static void LogEnvironmentSettingsCore(
ILogger logger,
IConfiguration configuration,
string applicationName,
string environmentName,
string contentRootPath,
string? webRootPath)
{
logger.LogInformation("==================== ENVIRONMENT SETTINGS ====================");
logger.LogInformation("Application Name: {ApplicationName}", environment.ApplicationName);
logger.LogInformation("Environment Name: {EnvironmentName}", environment.EnvironmentName);
logger.LogInformation("Content Root Path: {ContentRootPath}", environment.ContentRootPath);
logger.LogInformation("Web Root Path: {WebRootPath}", environment.WebRootPath);
logger.LogInformation("Application Name: {ApplicationName}", applicationName);
logger.LogInformation("Environment Name: {EnvironmentName}", environmentName);
logger.LogInformation("Content Root Path: {ContentRootPath}", contentRootPath);
if (!string.IsNullOrEmpty(webRootPath))
{
logger.LogInformation("Web Root Path: {WebRootPath}", webRootPath);
}
logger.LogInformation("-------------- Environment Variables --------------");
var envVars = Environment.GetEnvironmentVariables();
Helpers/startup-helpers/StartupExtensions.cs
+31
View File
@@ -44,6 +44,22 @@ public static class StartupExtensions
});
}
public static void ConfigureJsonSerilog(this HostApplicationBuilder builder, string serviceName, string appVersion)
{
builder.Services.AddSerilog((services, configuration) =>
{
configuration
.ReadFrom.Configuration(builder.Configuration)
.ReadFrom.Services(services)
.Enrich.FromLogContext()
.Enrich.WithMachineName()
.Enrich.WithEnvironmentName()
.Enrich.WithProperty("Service", serviceName)
.Enrich.WithProperty("AppVersion", appVersion)
.WriteTo.Console(new Serilog.Formatting.Json.JsonFormatter());
});
}
public static void AddAzureKeyVaultIfConfigured(this WebApplicationBuilder builder)
{
var keyVaultUri = builder.Configuration["KeyVault:VaultUri"];
@@ -131,6 +147,21 @@ public static class StartupExtensions
}
}
public static void LogHostStartupDiagnostics(this IHost host, string serviceName)
{
var logger = host.Services.GetRequiredService<ILoggerFactory>().CreateLogger(serviceName);
logger.LogInformation("{Service} starting up...", serviceName);
var environment = host.Services.GetRequiredService<IHostEnvironment>();
logger.LogInformation("Environment: {Environment}", environment.EnvironmentName);
var configuration = host.Services.GetRequiredService<IConfiguration>();
var logEnvironmentOnStartup = configuration.GetValue("LogEnvironmentOnStartup", defaultValue: true);
if (logEnvironmentOnStartup)
{
EnvironmentDiagnostics.LogEnvironmentSettings(logger, configuration, environment);
}
}
public static void UseDefaultSerilogRequestLogging(this WebApplication app, bool includeProxyHeaders = false)
{
app.UseSerilogRequestLogging(options =>
Helpers/startup-helpers/startup-helpers.csproj
+2
View File
@@ -17,6 +17,8 @@
<PackageReference Include="DotNetEnv" Version="3.2.0" />
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.Email" Version="4.2.1" />
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.7" />
</ItemGroup>
Jobs/cv-cleanup-job/Dockerfile
+2
View File
@@ -4,6 +4,7 @@ WORKDIR /src
COPY Jobs/cv-cleanup-job/cv-cleanup-job.csproj Jobs/cv-cleanup-job/
COPY Jobs/job-scheduler/job-scheduler.csproj Jobs/job-scheduler/
COPY Helpers/startup-helpers/startup-helpers.csproj Helpers/startup-helpers/
COPY Apis/api-models/api-models.csproj Apis/api-models/
COPY Apis/shared-models/shared-models.csproj Apis/shared-models/
@@ -11,6 +12,7 @@ RUN dotnet restore Jobs/cv-cleanup-job/cv-cleanup-job.csproj
COPY Jobs/cv-cleanup-job/ Jobs/cv-cleanup-job/
COPY Jobs/job-scheduler/ Jobs/job-scheduler/
COPY Helpers/startup-helpers/ Helpers/startup-helpers/
COPY Apis/api-models/ Apis/api-models/
COPY Apis/shared-models/ Apis/shared-models/
Jobs/cv-cleanup-job/Program.cs
+35 -9
View File
@@ -1,21 +1,47 @@
using System.Reflection;
using CvCleanupJob.Tasks;
using JobScheduler.Scheduling;
using JobScheduler.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Models.Settings;
using Serilog;
using StartupHelpers;
var builder = Host.CreateApplicationBuilder(args);
const string ServiceName = "cv-cleanup-job";
builder.Services.Configure<FileStorageSettings>(builder.Configuration.GetSection("FileStorage"));
StartupExtensions.LoadDotEnvFile();
var appVersion = StartupExtensions.GetApplicationVersion(Assembly.GetExecutingAssembly());
builder.Services.AddSingleton<CvStorageCleanupJobTask>();
builder.Services.AddSingleton<IEnumerable<IJobTask>>(sp => new IJobTask[]
try
{
sp.GetRequiredService<CvStorageCleanupJobTask>(),
});
var builder = Host.CreateApplicationBuilder(args);
builder.Services.AddHostedService<JobSchedulerHostedService>();
builder.ConfigureJsonSerilog(ServiceName, appVersion);
Log.Information("Starting {Service} version {AppVersion}", ServiceName, appVersion);
var host = builder.Build();
await host.RunAsync();
builder.Services.Configure<FileStorageSettings>(builder.Configuration.GetSection("FileStorage"));
builder.Services.AddSingleton<CvStorageCleanupJobTask>();
builder.Services.AddSingleton<IEnumerable<IJobTask>>(sp => new IJobTask[]
{
sp.GetRequiredService<CvStorageCleanupJobTask>(),
});
builder.Services.AddHostedService<JobSchedulerHostedService>();
var host = builder.Build();
host.LogHostStartupDiagnostics(ServiceName);
Log.Information("{Service} startup complete. Background scheduler is running.", ServiceName);
await host.RunAsync();
}
catch (Exception ex)
{
Log.Fatal(ex, "{Service} terminated unexpectedly", ServiceName);
}
finally
{
Log.CloseAndFlush();
}
Jobs/cv-cleanup-job/appsettings.json
+64 -1
View File
@@ -1,10 +1,73 @@
{
"Serilog": {
"Using": [
"Serilog.Sinks.Console",
"Serilog.Sinks.File",
"Serilog.Sinks.Email"
],
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft.AspNetCore": "Warning",
"Microsoft.Extensions.Hosting": "Information",
"Microsoft.Hosting.Lifetime": "Information",
"System.Net.Http.HttpClient": "Warning",
"CvCleanupJob": "Information",
"JobScheduler": "Information"
}
},
"WriteTo": [
{
"Name": "Console",
"Args": {
"outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {SourceContext}: {Message:lj}{NewLine}{Exception}"
}
},
{
"Name": "File",
"Args": {
"path": "logs/cv-cleanup-job-.log",
"rollingInterval": "Day",
"retainedFileCountLimit": 30,
"outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {SourceContext}: {Message:lj}{NewLine}{Exception}"
}
},
{
"Name": "Email",
"Args": {
"restrictedToMinimumLevel": "Error",
"fromEmail": "",
"toEmail": "",
"mailServer": "",
"networkCredential": {
"userName": "",
"password": ""
},
"port": 587,
"enableSsl": true,
"emailSubject": "[mihes.ro CV cleanup job] Error Alert",
"outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}",
"batchPostingLimit": 10,
"period": "0.00:05:00"
}
}
],
"Enrich": [
"FromLogContext",
"WithMachineName",
"WithEnvironmentName"
]
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.Hosting.Lifetime": "Information"
"Microsoft.Hosting.Lifetime": "Information",
"Microsoft.Extensions.Hosting": "Information",
"CvCleanupJob": "Information",
"JobScheduler": "Information"
}
},
"LogEnvironmentOnStartup": true,
"FileStorage": {
"Path": "Files"
},
Jobs/cv-cleanup-job/cv-cleanup-job.csproj
+5
View File
@@ -12,8 +12,13 @@
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="logs\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Apis\api-models\api-models.csproj" />
<ProjectReference Include="..\..\Helpers\startup-helpers\startup-helpers.csproj" />
<ProjectReference Include="..\job-scheduler\job-scheduler.csproj" />
</ItemGroup>
docker-compose/.env.template
+1 -1
View File
@@ -75,7 +75,7 @@ Jobs__CvStorageCleanupInterval=01:00:00
Jobs__CvStorageMaxTotalSizeMegabytes=40
# File Storage
FileStorage__Path=/opt/myai/files
FileStorage__Path=Files
FileStorage__DefaultFileName=
FileStorage__ToEmail=
FileStorage__SubjectPrefix=[File Download]
docker-compose/docker-compose.production.yml
+20
View File
@@ -212,14 +212,34 @@ services:
depends_on:
- api
environment:
# Worker + diagnostics (matches Jobs/cv-cleanup-job appsettings)
- ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT:-Production}
- APP_ENVIRONMENT_NAME=${APP_ENVIRONMENT_NAME:-myai.production}
- LogEnvironmentOnStartup=${LogEnvironmentOnStartup:-true}
# FileStorage: matches cv-cleanup-job appsettings FileStorage section
- FileStorage__Path=Files
# Jobs: matches cv-cleanup-job appsettings Jobs:Tasks
- Jobs__Tasks__0__Enabled=${Jobs__CvStorageCleanupEnabled:-true}
- Jobs__Tasks__0__Interval=${Jobs__CvStorageCleanupInterval:-01:00:00}
- Jobs__Tasks__0__Parameters__MaxTotalSizeMegabytes=${Jobs__CvStorageMaxTotalSizeMegabytes:-40}
# Logging / Serilog (matches Jobs/cv-cleanup-job appsettings Serilog section; WriteTo index 2 = Email)
- Logging__LogLevel__Default=${Logging__LogLevel__Default:-Information}
- Logging__LogLevel__Microsoft=${Logging__LogLevel__Microsoft:-Warning}
- Logging__LogLevel__Microsoft__Hosting__Lifetime=${Logging__LogLevel__Microsoft__Hosting__Lifetime:-Information}
- Logging__LogLevel__CvCleanupJob=${Logging__LogLevel__CvCleanupJob:-Information}
- Logging__LogLevel__JobScheduler=${Logging__LogLevel__JobScheduler:-Information}
- Serilog__MinimumLevel__Override__CvCleanupJob=${Serilog__MinimumLevel__Override__CvCleanupJob:-Information}
- Serilog__MinimumLevel__Override__JobScheduler=${Serilog__MinimumLevel__Override__JobScheduler:-Information}
- Serilog__WriteTo__2__Args__fromEmail=${Serilog__WriteTo__2__Args__fromEmail:-}
- Serilog__WriteTo__2__Args__toEmail=${Serilog__WriteTo__2__Args__toEmail:-}
- Serilog__WriteTo__2__Args__mailServer=${Serilog__WriteTo__2__Args__mailServer:-}
- Serilog__WriteTo__2__Args__networkCredential__userName=${Serilog__WriteTo__2__Args__networkCredential__userName:-}
- Serilog__WriteTo__2__Args__networkCredential__password=${Serilog__WriteTo__2__Args__networkCredential__password:-}
- Serilog__WriteTo__2__Args__port=${Serilog__WriteTo__2__Args__port:-587}
- Serilog__WriteTo__2__Args__enableSsl=${Serilog__WriteTo__2__Args__enableSsl:-true}
volumes:
- /opt/myai/logs/cv-cleanup-job:/app/logs
- /opt/myai/files:/app/Files
docker-compose/docker-compose.staging.yml
+21
View File
@@ -212,15 +212,36 @@ services:
depends_on:
- api
environment:
# Worker + diagnostics (matches Jobs/cv-cleanup-job appsettings)
- ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT:-Staging}
- APP_ENVIRONMENT_NAME=${APP_ENVIRONMENT_NAME:-myai.staging}
- LogEnvironmentOnStartup=${LogEnvironmentOnStartup:-true}
# FileStorage: matches cv-cleanup-job appsettings FileStorage section
- FileStorage__Path=Files
# Jobs: matches cv-cleanup-job appsettings Jobs:Tasks
- Jobs__Tasks__0__Enabled=${Jobs__CvStorageCleanupEnabled:-true}
- Jobs__Tasks__0__Interval=${Jobs__CvStorageCleanupInterval:-01:00:00}
- Jobs__Tasks__0__Parameters__MaxTotalSizeMegabytes=${Jobs__CvStorageMaxTotalSizeMegabytes:-40}
# Logging / Serilog (matches Jobs/cv-cleanup-job appsettings Serilog section; WriteTo index 2 = Email)
- Logging__LogLevel__Default=${Logging__LogLevel__Default:-Information}
- Logging__LogLevel__Microsoft=${Logging__LogLevel__Microsoft:-Warning}
- Logging__LogLevel__Microsoft__Hosting__Lifetime=${Logging__LogLevel__Microsoft__Hosting__Lifetime:-Information}
- Logging__LogLevel__CvCleanupJob=${Logging__LogLevel__CvCleanupJob:-Information}
- Logging__LogLevel__JobScheduler=${Logging__LogLevel__JobScheduler:-Information}
- Serilog__MinimumLevel__Override__CvCleanupJob=${Serilog__MinimumLevel__Override__CvCleanupJob:-Information}
- Serilog__MinimumLevel__Override__JobScheduler=${Serilog__MinimumLevel__Override__JobScheduler:-Information}
- Serilog__WriteTo__2__Args__fromEmail=${Serilog__WriteTo__2__Args__fromEmail:-}
- Serilog__WriteTo__2__Args__toEmail=${Serilog__WriteTo__2__Args__toEmail:-}
- Serilog__WriteTo__2__Args__mailServer=${Serilog__WriteTo__2__Args__mailServer:-}
- Serilog__WriteTo__2__Args__networkCredential__userName=${Serilog__WriteTo__2__Args__networkCredential__userName:-}
- Serilog__WriteTo__2__Args__networkCredential__password=${Serilog__WriteTo__2__Args__networkCredential__password:-}
- Serilog__WriteTo__2__Args__port=${Serilog__WriteTo__2__Args__port:-587}
- Serilog__WriteTo__2__Args__enableSsl=${Serilog__WriteTo__2__Args__enableSsl:-true}
volumes:
- /opt/myai/logs/cv-cleanup-job:/app/logs
- /opt/myai/files:/app/Files
networks:
- myai-network
docker-compose/docker-compose.yml
+22 -2
View File
@@ -220,7 +220,7 @@ services:
- Serilog__WriteTo__2__Args__enableSsl=${Serilog__WriteTo__2__Args__enableSsl:-true}
volumes:
- ../Apis/api/logs:/app/logs
- ${FileStorage__Path:-../Files}:/app/Files
- ../Apis/api/Files:/app/Files
networks:
- myai-network
restart: unless-stopped
@@ -237,16 +237,36 @@ services:
env_file:
- .env
environment:
# Worker + diagnostics (matches Jobs/cv-cleanup-job appsettings)
- ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT:-Development}
- APP_ENVIRONMENT_NAME=${APP_ENVIRONMENT_NAME:-myai.local}
- LogEnvironmentOnStartup=${LogEnvironmentOnStartup:-true}
# FileStorage: matches cv-cleanup-job appsettings FileStorage section
- FileStorage__Path=${FileStorage__Path:-Files}
# Jobs: matches cv-cleanup-job appsettings Jobs:Tasks
- Jobs__Tasks__0__Enabled=${Jobs__CvStorageCleanupEnabled:-true}
- Jobs__Tasks__0__Interval=${Jobs__CvStorageCleanupInterval:-01:00:00}
- Jobs__Tasks__0__Parameters__MaxTotalSizeMegabytes=${Jobs__CvStorageMaxTotalSizeMegabytes:-40}
# Logging / Serilog (matches Jobs/cv-cleanup-job appsettings Serilog section; WriteTo index 2 = Email)
- Logging__LogLevel__Default=${Logging__LogLevel__Default:-Information}
- Logging__LogLevel__Microsoft=${Logging__LogLevel__Microsoft:-Warning}
- Logging__LogLevel__Microsoft__Hosting__Lifetime=${Logging__LogLevel__Microsoft__Hosting__Lifetime:-Information}
- Logging__LogLevel__CvCleanupJob=${Logging__LogLevel__CvCleanupJob:-Information}
- Logging__LogLevel__JobScheduler=${Logging__LogLevel__JobScheduler:-Information}
- Serilog__MinimumLevel__Override__CvCleanupJob=${Serilog__MinimumLevel__Override__CvCleanupJob:-Information}
- Serilog__MinimumLevel__Override__JobScheduler=${Serilog__MinimumLevel__Override__JobScheduler:-Information}
- Serilog__WriteTo__2__Args__fromEmail=${Serilog__WriteTo__2__Args__fromEmail:-}
- Serilog__WriteTo__2__Args__toEmail=${Serilog__WriteTo__2__Args__toEmail:-}
- Serilog__WriteTo__2__Args__mailServer=${Serilog__WriteTo__2__Args__mailServer:-}
- Serilog__WriteTo__2__Args__networkCredential__userName=${Serilog__WriteTo__2__Args__networkCredential__userName:-}
- Serilog__WriteTo__2__Args__networkCredential__password=${Serilog__WriteTo__2__Args__networkCredential__password:-}
- Serilog__WriteTo__2__Args__port=${Serilog__WriteTo__2__Args__port:-587}
- Serilog__WriteTo__2__Args__enableSsl=${Serilog__WriteTo__2__Args__enableSsl:-true}
volumes:
- ../Apis/api/logs:/app/logs
- ../Jobs/cv-cleanup-job/logs:/app/logs
- ../Apis/api/Files:/app/Files
networks:
- myai-network