Cleaning up function

tommcdon · Dec 4, 2018 · 60b51cb · 60b51cb
1 parent f06230a
commit 60b51cb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 37 deletions.
diff --git a/CoreImageGallery/ImageGallery.AzFunctions/DeleteOriginalImage.cs b/CoreImageGallery/ImageGallery.AzFunctions/DeleteOriginalImage.cs
@@ -1,9 +1,10 @@
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using ImageGallery.Model;
 using Microsoft.Azure.WebJobs;
 using Microsoft.Azure.WebJobs.Host;
+using Microsoft.Extensions.Logging;
 using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Blob;
 
@@ -17,7 +18,7 @@ public static class DeleteOriginalImage
         public static async Task Run([BlobTrigger(Config.WatermarkedContainer + "/{name}", 
             Connection = "AzureWebJobsStorage")]Stream myBlob, 
             string name, 
-            TraceWriter log)
+            ILogger log)
         {
             string connectionString = Environment.GetEnvironmentVariable("AzureWebJobsStorage", EnvironmentVariableTarget.Process);
             CloudStorageAccount account = CloudStorageAccount.Parse(connectionString);
@@ -28,6 +29,8 @@ public static async Task Run([BlobTrigger(Config.WatermarkedContainer + "/{name}
             CloudBlockBlob blockBlob = container.GetBlockBlobReference(name);
 
             await blockBlob.DeleteIfExistsAsync();
+
+            log.LogInformation("Deleted original: {0}", name);
         }
     }
 }
diff --git a/CoreImageGallery/ImageGallery.AzFunctions/ImageUploaded.cs b/CoreImageGallery/ImageGallery.AzFunctions/ImageUploaded.cs
@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.IO;
 using ImageGallery.Model;
 using Microsoft.Azure.WebJobs;
 using Microsoft.Azure.WebJobs.Host;
+using Microsoft.Extensions.Logging;
 
 namespace Watermarker
 {
@@ -14,16 +15,16 @@ public static class ImageUploaded
         public static void Run([BlobTrigger("images/{name}")]Stream inputBlob,
                                [Blob("images-watermarked/{name}", FileAccess.Write)] Stream outputBlob,
                                string name,
-                               TraceWriter log)
+                               ILogger log)
         {
             try
             {
                 WaterMarker.WriteWatermark(WaterMarkText, inputBlob, outputBlob);
-                log.Info($"C# Blob trigger function Processed blob\n Name:{name} \n Size: {inputBlob.Length} Bytes");
+                log.LogInformation($"C# Blob trigger function Processed blob\n Name:{name} \n Size: {inputBlob.Length} Bytes");
             }
             catch (Exception e)
             {
-                log.Error($"Watermaking failed {e.Message}");
+                log.LogError($"Watermaking failed {e.Message}");
             }
         }
     }

diff --git a/CoreImageGallery/ImageGallery.AzFunctions/ImageUploaded.txt b/CoreImageGallery/ImageGallery.AzFunctions/ImageUploaded.txt