Merge pull request #23 from LykkeCity/LWDEV-10753-shutdown

LWDEV-10753: changes related to PR
LykkeCity · Sep 28, 2020 · b60e267 · b60e267
2 parents d9a66a1 + 12e45da
commit b60e267
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Lykke.Job.History/Workflow/ExecutionProcessing/ExecutionQueueReader.cs b/src/Lykke.Job.History/Workflow/ExecutionProcessing/ExecutionQueueReader.cs
@@ -57,7 +57,7 @@ void OnMessageReceived(object o, BasicDeliverEventArgs basicDeliverEventArgs)
 
                     foreach (var order in orders.Where(x => WalletIds.Contains(x.WalletId.ToString())))
                     {
-                        Log.Info("Order from ME (ExecutionProcessedEvent)", context: new {order.Id, order.Status, order.SequenceNumber}.ToJson());
+                        Log.Info("Order from ME (ExecutionProcessedEvent)", context: $"order: {new {order.Id, order.Status, order.SequenceNumber}.ToJson()}");
                     }
 
                     Queue.Enqueue(new CustomQueueItem<IEnumerable<Order>>(orders,
@@ -81,7 +81,7 @@ protected override async Task ProcessBatch(IList<CustomQueueItem<IEnumerable<Ord
 
             foreach (var order in orders.Where(x => WalletIds.Contains(x.WalletId.ToString())))
             {
-                Log.Info("Saving order (ProcessBatch)", context: new {order.Id, order.Status, order.SequenceNumber, batchId}.ToJson());
+                Log.Info("Saving order (ProcessBatch)", context: $"order: {new {order.Id, order.Status, order.SequenceNumber, batchId}.ToJson()}");
             }
 
             await _ordersRepository.UpsertBulkAsync(orders);
@@ -103,7 +103,7 @@ protected override void LogQueue()
                     var orders = item.Value.Select(x => new {x.Id, x.Status, x.SequenceNumber}).ToList()
                         .ToJson();
 
-                    Log.Info("Orders in queue on shutdown", context: orders);
+                    Log.Info("Orders in queue on shutdown", context: $"orders: {orders}");
                 }
             }
         }

diff --git a/src/Lykke.Job.History/Workflow/ExecutionProcessing/OrderEventQueueReader.cs b/src/Lykke.Job.History/Workflow/ExecutionProcessing/OrderEventQueueReader.cs
@@ -86,7 +86,7 @@ protected override void LogQueue()
             {
                 if (Queue.TryDequeue(out var item))
                 {
-                    var order = new {item.Value.Id, item.Value.Status}.ToJson();
+                    var order = $"order: {new {item.Value.Id, item.Value.Status}.ToJson()}";
 
                     Log.Info("Orders in queue on shutdown", context: order);
                 }