Fixed logging

FoundatioFx · Jan 31, 2025 · 98b485f · 98b485f
1 parent 345d2aa
commit 98b485f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/Foundatio.AzureStorage/Queues/AzureStorageQueue.cs b/src/Foundatio.AzureStorage/Queues/AzureStorageQueue.cs
@@ -115,7 +115,7 @@ protected override async Task<IQueueEntry<T>> DequeueImplAsync(CancellationToken
             return null;
         }
 
-        if (isTraceLogLevelEnabled) _logger.LogTrace("Dequeued message {Id}", message.Id);
+        if (isTraceLogLevelEnabled) _logger.LogTrace("Dequeued message {QueueEntryId}", message.Id);
         Interlocked.Increment(ref _dequeuedCount);
         var data = _serializer.Deserialize<T>(message.AsBytes);
         var entry = new AzureStorageQueueEntry<T>(message, data, this);
@@ -125,16 +125,16 @@ protected override async Task<IQueueEntry<T>> DequeueImplAsync(CancellationToken
 
     public override async Task RenewLockAsync(IQueueEntry<T> entry)
     {
-        if (_logger.IsEnabled(LogLevel.Debug)) _logger.LogDebug("Queue {Name} renew lock item: {EntryId}", _options.Name, entry.Id);
+        if (_logger.IsEnabled(LogLevel.Debug)) _logger.LogDebug("Queue {QueueName} renew lock item: {QueueEntryId}", _options.Name, entry.Id);
         var azureQueueEntry = ToAzureEntryWithCheck(entry);
         await _queueReference.UpdateMessageAsync(azureQueueEntry.UnderlyingMessage, _options.WorkItemTimeout, MessageUpdateFields.Visibility).AnyContext();
         await OnLockRenewedAsync(entry).AnyContext();
-        if (_logger.IsEnabled(LogLevel.Trace)) _logger.LogTrace("Renew lock done: {EntryId}", entry.Id);
+        if (_logger.IsEnabled(LogLevel.Trace)) _logger.LogTrace("Renew lock done: {QueueEntryId}", entry.Id);
     }
 
     public override async Task CompleteAsync(IQueueEntry<T> entry)
     {
-        if (_logger.IsEnabled(LogLevel.Debug)) _logger.LogDebug("Queue {Name} complete item: {EntryId}", _options.Name, entry.Id);
+        if (_logger.IsEnabled(LogLevel.Debug)) _logger.LogDebug("Queue {QueueName} complete item: {QueueEntryId}", _options.Name, entry.Id);
         if (entry.IsAbandoned || entry.IsCompleted)
             throw new InvalidOperationException("Queue entry has already been completed or abandoned.");
 
@@ -144,12 +144,12 @@ public override async Task CompleteAsync(IQueueEntry<T> entry)
         Interlocked.Increment(ref _completedCount);
         entry.MarkCompleted();
         await OnCompletedAsync(entry).AnyContext();
-        if (_logger.IsEnabled(LogLevel.Trace)) _logger.LogTrace("Complete done: {EntryId}", entry.Id);
+        if (_logger.IsEnabled(LogLevel.Trace)) _logger.LogTrace("Complete done: {QueueEntryId}", entry.Id);
     }
 
     public override async Task AbandonAsync(IQueueEntry<T> entry)
     {
-        if (_logger.IsEnabled(LogLevel.Debug)) _logger.LogDebug("Queue {Name}:{QueueId} abandon item: {EntryId}", _options.Name, QueueId, entry.Id);
+        if (_logger.IsEnabled(LogLevel.Debug)) _logger.LogDebug("Queue {QueueName}:{QueueId} abandon item: {QueueEntryId}", _options.Name, QueueId, entry.Id);
         if (entry.IsAbandoned || entry.IsCompleted)
             throw new InvalidOperationException("Queue entry has already been completed or abandoned.");
 
@@ -170,7 +170,7 @@ await Task.WhenAll(
         Interlocked.Increment(ref _abandonedCount);
         entry.MarkAbandoned();
         await OnAbandonedAsync(entry).AnyContext();
-        if (_logger.IsEnabled(LogLevel.Trace)) _logger.LogTrace("Abandon complete: {EntryId}", entry.Id);
+        if (_logger.IsEnabled(LogLevel.Trace)) _logger.LogTrace("Abandon complete: {QueueEntryId}", entry.Id);
     }
 
     protected override Task<IEnumerable<T>> GetDeadletterItemsImplAsync(CancellationToken cancellationToken)
@@ -281,11 +281,11 @@ protected override void StartWorkingImpl(Func<IQueueEntry<T>, CancellationToken,
         Task.Run(async () =>
         {
             bool isTraceLogLevelEnabled = _logger.IsEnabled(LogLevel.Trace);
-            if (isTraceLogLevelEnabled) _logger.LogTrace("WorkerLoop Start {Name}", _options.Name);
+            if (isTraceLogLevelEnabled) _logger.LogTrace("WorkerLoop Start {QueueName}", _options.Name);
 
             while (!linkedCancellationToken.IsCancellationRequested)
             {
-                if (isTraceLogLevelEnabled) _logger.LogTrace("WorkerLoop Signaled {Name}", _options.Name);
+                if (isTraceLogLevelEnabled) _logger.LogTrace("WorkerLoop Signaled {QueueName}", _options.Name);
 
                 IQueueEntry<T> queueEntry = null;
                 try
@@ -314,7 +314,7 @@ protected override void StartWorkingImpl(Func<IQueueEntry<T>, CancellationToken,
                 }
             }
 
-            if (isTraceLogLevelEnabled) _logger.LogTrace("Worker exiting: {Name} Cancel Requested: {IsCancellationRequested}", _queueReference.Name, linkedCancellationToken.IsCancellationRequested);
+            if (isTraceLogLevelEnabled) _logger.LogTrace("Worker exiting: {QueueName} Cancel Requested: {IsCancellationRequested}", _queueReference.Name, linkedCancellationToken.IsCancellationRequested);
         }, linkedCancellationToken.Token).ContinueWith(t => linkedCancellationToken.Dispose());
     }
 

diff --git a/src/Foundatio.AzureStorage/Storage/AzureFileStorage.cs b/src/Foundatio.AzureStorage/Storage/AzureFileStorage.cs
@@ -64,12 +64,15 @@ public async Task<Stream> GetFileStreamAsync(string path, StreamMode streamMode,
 
         try
         {
-            return streamMode switch {
+            return streamMode switch
+            {
                 StreamMode.Read => await blockBlob.OpenReadAsync(null, null, null, cancellationToken).AnyContext(),
                 StreamMode.Write => await blockBlob.OpenWriteAsync(null, null, null, cancellationToken).AnyContext(),
                 _ => throw new NotSupportedException($"Stream mode {streamMode} is not supported.")
             };
-        } catch (StorageException ex) when (ex is { RequestInformation.HttpStatusCode: 404}) {
+        }
+        catch (StorageException ex) when (ex is { RequestInformation.HttpStatusCode: 404 })
+        {
             _logger.LogDebug(ex, "Unable to get file stream for {Path}: File Not Found", normalizedPath);
             return null;
         }