From 1166a81eb39e547a8dc12a8a13260856fe143d60 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Tue, 3 Sep 2013 22:02:26 -0700
Subject: [PATCH] Chained commands keep the same CommandId in nlog context

---
 NzbDrone.Common/Messaging/MessageAggregator.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/NzbDrone.Common/Messaging/MessageAggregator.cs b/NzbDrone.Common/Messaging/MessageAggregator.cs
index b8ebd3690..750e7d9cd 100644
--- 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);