Mirrors/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-10-30 15:32:31 +01:00
Code Issues Releases Wiki Activity

Merge pull request #236 from Sonarr/db-locks

Browse Source 
DB locking due to Progress Messaging
This commit is contained in:
Mark McDowall 2015-04-18 11:09:16 -07:00
commit 61ae7dc189
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs
View File

@ -5,6 +5,7 @@ using NLog.Common;
using NLog.Config;
using NLog;
using NLog.Targets;
using NLog.Targets.Wrappers;
using NzbDrone.Common.Instrumentation;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Lifecycle;
@ -12,7 +13,6 @@ using NzbDrone.Core.Messaging.Events;
namespace NzbDrone.Core.Instrumentation
{
public class DatabaseTarget : TargetWithLayout, IHandle<ApplicationShutdownRequested>
{
private readonly SQLiteConnection _connection;
@ -30,7 +30,7 @@ namespace NzbDrone.Core.Instrumentation
{
Rule = new LoggingRule("*", LogLevel.Info, this);
LogManager.Configuration.AddTarget("DbLogger", this);
LogManager.Configuration.AddTarget("DbLogger", new AsyncTargetWrapper(this));
LogManager.Configuration.LoggingRules.Add(Rule);
LogManager.ConfigurationReloaded += OnLogManagerOnConfigurationReloaded;
LogManager.ReconfigExistingLoggers();

21
src/NzbDrone.Core/ProgressMessaging/ProgressMessageTarget.cs
View File

@ -2,6 +2,7 @@
using NLog.Config;
using NLog;
using NLog.Targets;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Lifecycle;
using NzbDrone.Core.Messaging.Commands;
using NzbDrone.Core.Messaging.Events;
@ -14,6 +15,8 @@ namespace NzbDrone.Core.ProgressMessaging
private readonly IManageCommandQueue _commandQueueManager;
private static LoggingRule _rule;
private const string REENTRY_LOCK = "ProgressMessagingLock";
public ProgressMessageTarget(IEventAggregator eventAggregator, IManageCommandQueue commandQueueManager)
{
_eventAggregator = eventAggregator;
@ -22,6 +25,8 @@ namespace NzbDrone.Core.ProgressMessaging
protected override void Write(LogEventInfo logEvent)
{
if (!ReentryPreventionCheck()) return;
var command = GetCurrentCommand();
if (IsClientMessage(logEvent, command))
@ -29,6 +34,8 @@ namespace NzbDrone.Core.ProgressMessaging
_commandQueueManager.SetMessage(command, logEvent.FormattedMessage);
_eventAggregator.PublishEvent(new CommandUpdatedEvent(command));
}
MappedDiagnosticsContext.Remove(REENTRY_LOCK);
}
private CommandModel GetCurrentCommand()
@ -53,6 +60,20 @@ namespace NzbDrone.Core.ProgressMessaging
return logEvent.Properties.ContainsKey("Status");
}
private bool ReentryPreventionCheck()
{
var reentryLock = MappedDiagnosticsContext.Get(REENTRY_LOCK);
var commandId = MappedDiagnosticsContext.Get("CommandId");
if (reentryLock.IsNullOrWhiteSpace() || reentryLock != commandId)
{
MappedDiagnosticsContext.Set(REENTRY_LOCK, MappedDiagnosticsContext.Get("CommandId"));
return true;
}
return false;
}
public void Handle(ApplicationStartedEvent message)
{
_rule = new LoggingRule("*", LogLevel.Trace, this);