mirror of
https://github.com/LD-Reborn/Berufsschule_HAM.git
synced 2025-12-20 06:51:55 +00:00
Merge pull request #1 from LD-Reborn/5-feature-add-serilog-elmah
Added logging, added Elmah error logging
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,2 +1,4 @@
|
||||
bin/*
|
||||
obj/*
|
||||
logs/*
|
||||
Elmah/*
|
||||
|
||||
@@ -5,7 +5,10 @@
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ElmahCore" Version="2.1.2" />
|
||||
<PackageReference Include="Novell.Directory.Ldap" Version="2.2.1" />
|
||||
<PackageReference Include="Serilog" Version="4.3.0" />
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="9.0.4" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.4" />
|
||||
|
||||
49
Program.cs
49
Program.cs
@@ -1,42 +1,13 @@
|
||||
// var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
// // Add services to the container.
|
||||
// builder.Services.AddControllersWithViews();
|
||||
|
||||
// var app = builder.Build();
|
||||
|
||||
// // Configure the HTTP request pipeline.
|
||||
// if (!app.Environment.IsDevelopment())
|
||||
// {
|
||||
// app.UseExceptionHandler("/Home/Error");
|
||||
// // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
|
||||
// app.UseHsts();
|
||||
// }
|
||||
|
||||
// app.UseHttpsRedirection();
|
||||
// app.UseRouting();
|
||||
|
||||
// app.UseAuthorization();
|
||||
|
||||
// app.MapStaticAssets();
|
||||
|
||||
// app.MapControllerRoute(
|
||||
// name: "default",
|
||||
// pattern: "{controller=Home}/{action=Index}/{id?}")
|
||||
// .WithStaticAssets();
|
||||
|
||||
|
||||
// app.Run();
|
||||
|
||||
using ElmahCore;
|
||||
using ElmahCore.Mvc;
|
||||
using Serilog;
|
||||
using Berufsschule_HAM.Services;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
// Bind options
|
||||
builder.Services.Configure<LdapOptions>(builder.Configuration.GetSection("Ldap"));
|
||||
|
||||
// Register LDAP service as singleton (it manages its own connection)
|
||||
builder.Services.AddSingleton<LdapService>();
|
||||
|
||||
|
||||
builder.Services.AddControllersWithViews();
|
||||
@@ -44,6 +15,18 @@ builder.Services.AddControllersWithViews();
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
|
||||
Log.Logger = new LoggerConfiguration()
|
||||
.ReadFrom.Configuration(builder.Configuration)
|
||||
.CreateLogger();
|
||||
builder.Services.AddSerilog();
|
||||
|
||||
builder.Services.AddElmah<XmlFileErrorLog>(Options =>
|
||||
{
|
||||
Options.LogPath = builder.Configuration.GetValue<string>("Elmah:LogFolder") ?? "~/logs";
|
||||
});
|
||||
|
||||
builder.Services.AddSingleton<LdapService>();
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
if (!app.Environment.IsDevelopment())
|
||||
@@ -51,7 +34,7 @@ if (!app.Environment.IsDevelopment())
|
||||
app.UseExceptionHandler("/Home/Error");
|
||||
}
|
||||
|
||||
//app.MapSwagger();
|
||||
app.UseElmah();
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
|
||||
|
||||
@@ -12,11 +12,13 @@ public class LdapService : IDisposable
|
||||
{
|
||||
private readonly LdapOptions _opts;
|
||||
private readonly LdapConnection _conn;
|
||||
private ILogger _logger;
|
||||
|
||||
public LdapService(IOptions<LdapOptions> options)
|
||||
public LdapService(IOptions<LdapOptions> options, ILogger<LdapService> logger)
|
||||
{
|
||||
_opts = options.Value;
|
||||
_conn = new LdapConnection { SecureSocketLayer = _opts.UseSsl };
|
||||
_logger = logger;
|
||||
ConnectAndBind();
|
||||
}
|
||||
|
||||
@@ -26,8 +28,16 @@ public class LdapService : IDisposable
|
||||
{
|
||||
Console.WriteLine(_opts.Host);
|
||||
Console.WriteLine(_opts.Port);
|
||||
try
|
||||
{
|
||||
_conn.Connect(_opts.Host, _opts.Port);
|
||||
}
|
||||
catch (SystemException ex)
|
||||
{
|
||||
_logger.LogCritical("Unable to connect to LDAP: {ex.Message}\n{ex.StackTrace}", [ex.Message, ex.StackTrace]);
|
||||
throw;
|
||||
}
|
||||
}
|
||||
_conn.Bind(_opts.BindDn, _opts.BindPassword);
|
||||
}
|
||||
|
||||
|
||||
@@ -5,6 +5,24 @@
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"Serilog": {
|
||||
"Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
|
||||
"MinimumLevel": "Information",
|
||||
"WriteTo": [
|
||||
{ "Name": "Console" },
|
||||
{ "Name": "File", "Args": { "path": "logs/log.txt", "rollingInterval": "Day", "retainedFileCountLimit": 7 } }
|
||||
],
|
||||
"Properties": {
|
||||
"Application": "Embeddingsearch.Indexer"
|
||||
}
|
||||
},
|
||||
"Elmah": {
|
||||
"AllowedHosts": [
|
||||
"127.0.0.1",
|
||||
"::1"
|
||||
],
|
||||
"LogFolder": "./Elmah"
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"Ldap": {
|
||||
"Host": "ld50.dev",
|
||||
|
||||
Reference in New Issue
Block a user