tedkulp/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2026-04-26 23:06:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prevent ProgressMessageTarget from ever reading the command from the database.

Browse Source
This commit is contained in:
Taloth Saldono
2015-06-03 20:17:50 +02:00
parent 6d18b37a94
commit 866f971d41
6 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/ProgressMessaging/ProgressMessageTarget.cs
+7 -32
View File
@@ -15,8 +15,6 @@ 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;
@@ -25,29 +23,20 @@ namespace NzbDrone.Core.ProgressMessaging
protected override void Write(LogEventInfo logEvent)
{
if (!ReentryPreventionCheck()) return;
var command = ProgressMessageContext.CommandModel;
var command = GetCurrentCommand();
if (IsClientMessage(logEvent, command))
if (!IsClientMessage(logEvent, command)) return;
if (!ProgressMessageContext.LockReentrancy()) return;
try
{
_commandQueueManager.SetMessage(command, logEvent.FormattedMessage);
_eventAggregator.PublishEvent(new CommandUpdatedEvent(command));
}
MappedDiagnosticsContext.Remove(REENTRY_LOCK);
}
private CommandModel GetCurrentCommand()
{
var commandId = MappedDiagnosticsContext.Get("CommandId");
if (String.IsNullOrWhiteSpace(commandId))
finally
{
return null;
ProgressMessageContext.UnlockReentrancy();
}
return _commandQueueManager.Get(Convert.ToInt32(commandId));
}
private bool IsClientMessage(LogEventInfo logEvent, CommandModel command)
@@ -60,20 +49,6 @@ 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);