Chained commands keep the same CommandId in nlog context

11 years ago · 1166a81eb3
parent c184ec2d98
commit 1166a81eb3
1 changed files with 4 additions and 1 deletions
--- a/NzbDrone.Common/Messaging/MessageAggregator.cs
+++ b/NzbDrone.Common/Messaging/MessageAggregator.cs
@ -145,7 +145,10 @@ namespace NzbDrone.Common.Messaging

            try
            {
-                MappedDiagnosticsContext.Set("CommandId", trackedCommand.Command.CommandId);
+                if (!MappedDiagnosticsContext.Contains("CommandId"))
+                {
+                    MappedDiagnosticsContext.Set("CommandId", trackedCommand.Command.CommandId);
+                }

                PublishEvent(new CommandStartedEvent(trackedCommand));
                handler.Execute(command);