diff --git a/src/WebJobs.Extensions.Timers.Storage/StorageScheduleMonitor.cs b/src/WebJobs.Extensions.Timers.Storage/StorageScheduleMonitor.cs index fa7e68643..a15d7519e 100644 --- a/src/WebJobs.Extensions.Timers.Storage/StorageScheduleMonitor.cs +++ b/src/WebJobs.Extensions.Timers.Storage/StorageScheduleMonitor.cs @@ -141,7 +141,7 @@ public override async Task UpdateStatusAsync(string timerName, ScheduleStatus st catch (Exception ex) { // best effort - _logger.LogError(ex, $"Function '{timerName}' failed to update the timer trigger status."); + _logger.LogError(ex, "Function '{timerName}' failed to update the timer trigger status.", timerName); } } diff --git a/src/WebJobs.Extensions/Extensions/Files/Listener/FileListener.cs b/src/WebJobs.Extensions/Extensions/Files/Listener/FileListener.cs index d01b31000..e99356820 100644 --- a/src/WebJobs.Extensions/Extensions/Files/Listener/FileListener.cs +++ b/src/WebJobs.Extensions/Extensions/Files/Listener/FileListener.cs @@ -260,7 +260,8 @@ private void ProcessFiles() if (filesToProcess.Length > 0) { - _logger.LogDebug($"Found {filesToProcess.Length} file(s) at path '{_watchPath}' for ready processing"); + _logger.LogDebug("Found {fileCount} file(s) at path '{watchPath}' for ready processing", + filesToProcess.Length, _watchPath); } foreach (string fileToProcess in filesToProcess) diff --git a/src/WebJobs.Extensions/Extensions/Files/Listener/FileProcessor.cs b/src/WebJobs.Extensions/Extensions/Files/Listener/FileProcessor.cs index ddd2384bd..56cf6df12 100644 --- a/src/WebJobs.Extensions/Extensions/Files/Listener/FileProcessor.cs +++ b/src/WebJobs.Extensions/Extensions/Files/Listener/FileProcessor.cs @@ -330,7 +330,8 @@ public virtual void CleanupProcessedFiles() if (filesDeleted > 0) { - _logger.LogDebug($"File Cleanup ({_filePath}): {filesDeleted} files deleted"); + _logger.LogDebug("File Cleanup ({filePath}): {filesDeleted} files deleted", + _filePath, filesDeleted); } } diff --git a/src/WebJobs.Extensions/Extensions/Timers/Listener/TimerListener.cs b/src/WebJobs.Extensions/Extensions/Timers/Listener/TimerListener.cs index 13c73efb1..bea194b57 100644 --- a/src/WebJobs.Extensions/Extensions/Timers/Listener/TimerListener.cs +++ b/src/WebJobs.Extensions/Extensions/Timers/Listener/TimerListener.cs @@ -148,7 +148,7 @@ public async Task StartAsync(CancellationToken cancellationToken) StartTimer(DateTime.Now); } - _logger.LogDebug($"Timer listener started ({_functionLogName})"); + _logger.LogDebug("Timer listener started ({functionName})", _functionLogName); } public async Task StopAsync(CancellationToken cancellationToken) @@ -169,7 +169,7 @@ public async Task StopAsync(CancellationToken cancellationToken) await _invocationLock.WaitAsync(); _invocationLock.Release(); - _logger.LogDebug($"Timer listener stopped ({_functionLogName})"); + _logger.LogDebug("Timer listener stopped ({functionName})", _functionLogName); } public void Cancel() @@ -342,7 +342,8 @@ internal async Task InvokeJobFunction(DateTime invocationTime, bool isPastDue = if (ScheduleMonitor != null) { await ScheduleMonitor.UpdateStatusAsync(_timerLookupName, ScheduleStatus); - _logger.LogDebug($"Function '{_functionLogName}' updated status: Last='{ScheduleStatus.Last.ToString("o")}', Next='{ScheduleStatus.Next.ToString("o")}', LastUpdated='{ScheduleStatus.LastUpdated.ToString("o")}'"); + _logger.LogDebug("Function '{functionName}' updated status: Last='{lastScheduled}\', Next=\'{nextScheduled}\', LastUpdated=\'{lastUpdated}\'", + _functionLogName, ScheduleStatus.Last.ToString("o"), ScheduleStatus.Next.ToString("o"), ScheduleStatus.LastUpdated.ToString("o")); } } finally