Fixed: Broken tasks getting stuck in queue

This commit is contained in:
Mark McDowall 2020-03-05 17:57:11 -08:00
parent 63e01aff8c
commit 295fdad750
1 changed files with 11 additions and 6 deletions

View File

@ -63,13 +63,15 @@ namespace NzbDrone.Core.Messaging.Commands
private void ExecuteCommand<TCommand>(TCommand command, CommandModel commandModel) where TCommand : Command private void ExecuteCommand<TCommand>(TCommand command, CommandModel commandModel) where TCommand : Command
{ {
var handlerContract = typeof(IExecute<>).MakeGenericType(command.GetType()); IExecute<TCommand> handler = null;
var handler = (IExecute<TCommand>)_serviceFactory.Build(handlerContract);
_logger.Trace("{0} -> {1}", command.GetType().Name, handler.GetType().Name);
try try
{ {
var handlerContract = typeof(IExecute<>).MakeGenericType(command.GetType());
handler = (IExecute<TCommand>)_serviceFactory.Build(handlerContract);
_logger.Trace("{0} -> {1}", command.GetType().Name, handler.GetType().Name);
_commandQueueManager.Start(commandModel); _commandQueueManager.Start(commandModel);
BroadcastCommandUpdate(commandModel); BroadcastCommandUpdate(commandModel);
@ -104,9 +106,12 @@ namespace NzbDrone.Core.Messaging.Commands
{ {
ProgressMessageContext.CommandModel = null; ProgressMessageContext.CommandModel = null;
} }
}
_logger.Trace("{0} <- {1} [{2}]", command.GetType().Name, handler.GetType().Name, commandModel.Duration.ToString()); if (handler != null)
{
_logger.Trace("{0} <- {1} [{2}]", command.GetType().Name, handler.GetType().Name, commandModel.Duration.ToString());
}
}
} }
private void BroadcastCommandUpdate(CommandModel command) private void BroadcastCommandUpdate(CommandModel command)