Merge logging fixes to master (#103)

* Fix logging to properly attach exception info in Stats.ImportAzureCdnStatistics catch-all blocks (#102) * Fix logging message
NuGet · Feb 8, 2017 · dde504d · dde504d
1 parent 68d9b5a
commit dde504d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/Stats.AzureCdnLogs.Common/LogEvents.cs b/src/Stats.AzureCdnLogs.Common/LogEvents.cs
@@ -21,5 +21,6 @@ public class LogEvents
         public static EventId InvalidRawLogFileName = new EventId(511, "Invalid raw log filename");
         public static EventId FailedToGetFtpResponse = new EventId(512, "Failed to get FTP response");
         public static EventId JobRunFailed = new EventId(550, "Job run failed");
+        public static EventId JobInitFailed = new EventId(551, "Job initialization failed");
     }
 }
diff --git a/src/Stats.ImportAzureCdnStatistics/Job.cs b/src/Stats.ImportAzureCdnStatistics/Job.cs
@@ -64,7 +64,7 @@ public override bool Init(IDictionary<string, string> jobArgsDictionary)
             }
             catch (Exception exception)
             {
-                _logger.LogCritical("Failed to initialize job! {Exception}", exception);
+                _logger.LogCritical(LogEvents.JobInitFailed, exception, "Failed to initialize job!");
 
                 return false;
             }
@@ -117,7 +117,7 @@ public override async Task<bool> Run()
             }
             catch (Exception exception)
             {
-                _logger.LogCritical("Job run failed! {Exception}", exception);
+                _logger.LogCritical(LogEvents.JobRunFailed, exception, "Job run failed!");
 
                 return false;
             }

diff --git a/src/Stats.ImportAzureCdnStatistics/LogFileProcessor.cs b/src/Stats.ImportAzureCdnStatistics/LogFileProcessor.cs
@@ -383,7 +383,7 @@ private async Task DeleteSourceBlobAsync(ILeasedLogFile logFile)
                 }
                 catch (Exception exception)
                 {
-                    _logger.LogError(LogEvents.FailedBlobDelete, exception, "Finished to delete blob {FtpBlobUri}", logFile.Uri);
+                    _logger.LogError(LogEvents.FailedBlobDelete, exception, "Failed to delete blob {FtpBlobUri}", logFile.Uri);
                     ApplicationInsightsHelper.TrackException(exception, logFile.Blob.Name);
                     throw;
                 }