Add logging

using-system · Dec 4, 2018 · 1210889 · 1210889
1 parent 633825a
commit 1210889
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 3 deletions.
diff --git a/ProcessMyMedia.Samples/Program.cs b/ProcessMyMedia.Samples/Program.cs
@@ -1,6 +1,5 @@
 namespace ProcessMyMedia.Samples
 {
-    using System;
     using System.IO;
 
     using Microsoft.Extensions.Configuration;
@@ -16,7 +15,7 @@ static void Main(string[] args)
 
             IConfigurationRoot configuration = builder.Build();
 
-            new Samples.AnalyseAsset(configuration).Execute();
+            new Samples.IngestFromDirectory(configuration).Execute();
         }
     }
 }
diff --git a/ProcessMyMedia/Tasks/Data/CopyTask.cs b/ProcessMyMedia/Tasks/Data/CopyTask.cs
@@ -127,6 +127,8 @@ protected async override Task<ExecutionResult> RunTaskAsync(IStepExecutionContex
                     }
                 };
 
+                this.logger.LogDebug($"Create the pipeline for the Copy Task");
+
                 await this.service.CreateOrUpdatePipelineyAsync(pipeline);
 
                 runID = await this.service.RunPipelineAsync(pipeline.Name);
@@ -141,6 +143,7 @@ protected async override Task<ExecutionResult> RunTaskAsync(IStepExecutionContex
             if (!this.Output.Run.IsFinished
                 || context.PersistenceData == null)
             {
+                this.logger.LogInformation("The copy is in progress.");
                 return ExecutionResult.Sleep(this.delayService.GetTimeToSleep(this.Output.Run.StartDate), this.Output);
             }
             else if (this.Output.Run.OnError)

diff --git a/ProcessMyMedia/Tasks/Data/CreateLinkedServiceTask.cs b/ProcessMyMedia/Tasks/Data/CreateLinkedServiceTask.cs
@@ -67,6 +67,8 @@ protected override void ValidateInput()
         /// <returns></returns>
         protected async override Task<ExecutionResult> RunTaskAsync(IStepExecutionContext context)
         {
+            this.logger.LogInformation($"Create the Linked service {this.LinkedServiceToCreate.Name}");
+
             await this.service.CreateOrUpdateLinkedServiceAsync(
                 this.LinkedServiceToCreate.Name,
                 this.LinkedServiceToCreate.Type,

diff --git a/ProcessMyMedia/Tasks/Media/Analyzing/AnalyzeFileTask.cs b/ProcessMyMedia/Tasks/Media/Analyzing/AnalyzeFileTask.cs
@@ -57,8 +57,12 @@ protected async override Task RunMediaAnalyseTaskAsync(IStepExecutionContext con
         {
             string assetName = $"input-{Guid.NewGuid()}";
 
+            this.logger.LogInformation($"Create the asset {assetName}");
+
             var asset = await service.CreateOrUpdateAssetAsync(assetName);
 
+            this.logger.LogDebug($"Upload the file {this.FilePath} for the asset {this.AssetName}");
+
             await service.UploadFilesToAssetAsync(assetName, new[] { this.FilePath });
 
             this.AssetName = assetName;

diff --git a/ProcessMyMedia/Tasks/Media/Analyzing/AnalyzeTaskBase.cs b/ProcessMyMedia/Tasks/Media/Analyzing/AnalyzeTaskBase.cs
@@ -63,6 +63,9 @@ protected override async Task<ExecutionResult> RunTaskAsync(IStepExecutionContex
             {
                 //First call: stat analyse
                 await this.RunMediaAnalyseTaskAsync(context);
+
+                this.logger.LogInformation($"Start analyse the asset {this.AssetName}");
+
                 job = await this.service.StartAnalyseAsync(this.AssetName, this.AnalyzingParameters);
             }
             else
@@ -75,6 +78,7 @@ protected override async Task<ExecutionResult> RunTaskAsync(IStepExecutionContex
             if (!job.IsFinished)
             {
                 this.logger.LogInformation($"Analysing progress : {job.Progress} %");
+
                 return ExecutionResult.Sleep(this.delayService.GetTimeToSleep(job.Created), job);
             }
             else if (job.Canceled)

diff --git a/ProcessMyMedia/Tasks/Media/Asset/DeleteAssetTask.cs b/ProcessMyMedia/Tasks/Media/Asset/DeleteAssetTask.cs
@@ -52,6 +52,8 @@ protected override void ValidateInput()
         /// <returns></returns>
         protected override async Task<ExecutionResult> RunTaskAsync(IStepExecutionContext context)
         {
+            this.logger.LogInformation($"Delete the asset {this.AssetName}");
+
             await this.service.DeleteAssetAsync(this.AssetName);
 
             return ExecutionResult.Next();

diff --git a/ProcessMyMedia/Tasks/Media/Asset/DownloadAssetTask.cs b/ProcessMyMedia/Tasks/Media/Asset/DownloadAssetTask.cs
@@ -67,6 +67,8 @@ protected override void ValidateInput()
         /// <returns></returns>
         protected async override Task<ExecutionResult> RunTaskAsync(IStepExecutionContext context)
         {
+            this.logger.LogInformation($"Upload files from the asset {this.AssetName} to {this.DirectoryToDownload}");
+
             await this.service.DownloadFilesAsync(this.AssetName, this.DirectoryToDownload);
 
             return ExecutionResult.Next();

diff --git a/ProcessMyMedia/Tasks/Media/Asset/IngestFilesTaskBase.cs b/ProcessMyMedia/Tasks/Media/Asset/IngestFilesTaskBase.cs
@@ -67,6 +67,8 @@ protected override async Task<ExecutionResult> RunTaskAsync(IStepExecutionContex
         {
             await base.RunTaskAsync(context);
 
+            this.logger.LogDebug($"Upload {this.AssetFiles.Count} files for the asset {this.AssetName}");
+
             await this.service.UploadFilesToAssetAsync(this.AssetName, this.AssetFiles, this.Metadata);
 
             return ExecutionResult.Next();

diff --git a/ProcessMyMedia/Tasks/Media/Asset/IngestTask.cs b/ProcessMyMedia/Tasks/Media/Asset/IngestTask.cs
@@ -67,6 +67,8 @@ protected override void ValidateInput()
         /// <returns></returns>
         protected async override Task<ExecutionResult> RunTaskAsync(IStepExecutionContext context)
         {
+            this.logger.LogInformation($"Create the asset {this.AssetName}");
+
             AssetEntity asset = await this.service.CreateOrUpdateAssetAsync(this.AssetName,
                 assetDescription: this.AssetDescription,
                 storageAccountName: this.StorageAccountName);

diff --git a/ProcessMyMedia/Tasks/Media/Encoding/EncodeFileTaskBase.cs b/ProcessMyMedia/Tasks/Media/Encoding/EncodeFileTaskBase.cs
@@ -64,8 +64,12 @@ protected override async Task RunMediaEncodingTaskAsync(IStepExecutionContext co
         {
             string assetName = $"input-{Guid.NewGuid()}";
 
+            this.logger.LogInformation($"Create the encoding input asset {assetName} for the file {this.FilePath}");
+
             var asset = await service.CreateOrUpdateAssetAsync(assetName);
 
+            this.logger.LogInformation($"Upload the file {this.FilePath} for the asset {assetName}");
+
             await service.UploadFilesToAssetAsync(assetName, new[] { this.FilePath });
 
             this.Inputs.Add (new JobInputEntity(){ Name = assetName});

diff --git a/ProcessMyMedia/Tasks/Media/Encoding/EncodeTaskBase.cs b/ProcessMyMedia/Tasks/Media/Encoding/EncodeTaskBase.cs
@@ -77,6 +77,9 @@ protected override async Task<ExecutionResult> RunTaskAsync(IStepExecutionContex
             {
                 //First call: start encoding
                 await this.RunMediaEncodingTaskAsync(context);
+
+                this.logger.LogInformation("Start encoding");
+
                 job = await this.service.StartEncodeAsync(this.Inputs, this.Outputs, this.Priority);
             }
             else

diff --git a/ProcessMyMedia/Tasks/TaskBase.cs b/ProcessMyMedia/Tasks/TaskBase.cs
@@ -50,19 +50,25 @@ public override async Task<ExecutionResult> RunAsync(IStepExecutionContext conte
 
             try
             {
+                this.logger.LogDebug($"Task {this.GetType().Name} started");
+
                 var result = await this.RunTaskAsync(context);
 
                 if (this.CleanupResources && !result.SleepFor.HasValue)
                 {
                     await this.Cleanup(context);
                 }
 
+                this.logger.LogDebug($"Task {this.GetType().Name} completed");
+
                 return result;
             }
-            catch
+            catch(Exception exc)
             {
                 this.onError = true;
 
+                this.logger.LogError($"Task {this.GetType().Name} terminated with error {exc}");
+
                 if (this.CleanupResources)
                 {
                     await this.Cleanup(context);