Skip to content

Commit

Permalink
Cleanse exceptions in event logs
Browse files Browse the repository at this point in the history
(cherry picked from commit 404e6d68ea526ab521cd39ecda1bf3b02285765d)
  • Loading branch information
mynameisbogdan committed Oct 27, 2024
1 parent 20eb61d commit f7acd57
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,33 +60,36 @@ protected override void Write(LogEventInfo logEvent)
{
try
{
var log = new Log();
log.Time = logEvent.TimeStamp;
log.Message = CleanseLogMessage.Cleanse(logEvent.FormattedMessage);

log.Logger = logEvent.LoggerName;
var log = new Log
{
Time = logEvent.TimeStamp,
Logger = logEvent.LoggerName,
Level = logEvent.Level.Name
};

if (log.Logger.StartsWith("NzbDrone."))
{
log.Logger = log.Logger.Remove(0, 9);
}

var message = logEvent.FormattedMessage;

if (logEvent.Exception != null)
{
if (string.IsNullOrWhiteSpace(log.Message))
if (string.IsNullOrWhiteSpace(message))
{
log.Message = logEvent.Exception.Message;
message = logEvent.Exception.Message;
}
else
{
log.Message += ": " + logEvent.Exception.Message;
message += ": " + logEvent.Exception.Message;
}

log.Exception = logEvent.Exception.ToString();
log.Exception = CleanseLogMessage.Cleanse(logEvent.Exception.ToString());
log.ExceptionType = logEvent.Exception.GetType().ToString();
}

log.Level = logEvent.Level.Name;
log.Message = CleanseLogMessage.Cleanse(message);

var connectionInfo = _connectionStringFactory.LogDbConnection;

Expand Down

0 comments on commit f7acd57

Please sign in to comment.