modifications to ExceptionMiddleware

This commit is contained in:
sbwalker 2024-03-01 16:14:33 -05:00
parent 62695d4d9a
commit ca58bf661d

View File

@ -1,11 +1,10 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Oqtane.Enums; using Oqtane.Enums;
using Oqtane.Models; using Oqtane.Extensions;
using Oqtane.Shared; using Oqtane.Shared;
namespace Oqtane.Infrastructure namespace Oqtane.Infrastructure
@ -27,18 +26,18 @@ namespace Oqtane.Infrastructure
} }
catch (Exception exception) catch (Exception exception)
{ {
var _logger = provider.GetRequiredService<ILogManager>();
var endPoint = context.GetEndpoint()?.DisplayName; var endPoint = context.GetEndpoint()?.DisplayName;
var contextAlias = context.Items.FirstOrDefault(i => i.Key.ToString() == "Alias"); var alias = context.GetAlias();
Alias alias; if (alias != null)
int siteId = -1;
var defaultVal = default(KeyValuePair<int, string>);
if (!contextAlias.Equals(defaultVal))
{ {
alias = contextAlias.Value as Alias; var _logger = provider.GetRequiredService<ILogManager>();
siteId = alias.SiteId; _logger.Log(alias.SiteId, Shared.LogLevel.Error, this, LogFunction.Other, exception, "Unhandled Exception: {Error} For Endpoint: {Endpoint}", exception.Message, endPoint);
}
else
{
var _filelogger = provider.GetRequiredService<ILogger<ExceptionMiddleware>>();
_filelogger.LogError(Utilities.LogMessage(this, $"Endpoint: {endPoint} Unhandled Exception: {exception}"));
} }
_logger.Log(siteId, LogLevel.Error, endPoint, LogFunction.Other, exception, exception.Message, context.User?.Identity.Name);
} }
} }
} }