add ILogger

Author: afifi-ins

Extensibility/ErrorHandling/ErrorLogging/Service/CalculatorService.cs

@@ -54,26 +54,24 @@ public int Factorial(int n)
 
     public class CalculatorErrorHandler : IErrorHandler
     {
+        private ILogger _logger;
         // Provide a fault. The Message fault parameter can be replaced, or set to
         // null to suppress reporting a fault.
+        public CalculatorErrorHandler(ILogger<CalculatorErrorHandler> logger)
+        {
+            _logger = logger;
+        }
 
         public void ProvideFault(Exception error, MessageVersion version, ref Message fault)
         {
         }
 
         // HandleError. Log an error, then allow the error to be handled as usual.
         // Return true if the error is considered as already handled
-
         public bool HandleError(Exception error)
         {
-            using (TextWriter tw = File.AppendText(@"c:\logs\error.txt"))
-            {
-                if (error != null)
-                {
-                    tw.WriteLine("Exception: " + error.GetType().Name + " - " + error.Message);
-                }
-                tw.Close();
-            }
+            _logger.LogInformation("Exception: " + error.GetType().Name + " - " + error.Message);
+
             return true;
         }
     }
@@ -91,18 +89,19 @@ public ErrorBehaviorAttribute(Type errorHandlerType)
         void IServiceBehavior.Validate(ServiceDescription description, ServiceHostBase serviceHostBase)
         {
         }
-        
+
         void IServiceBehavior.AddBindingParameters(ServiceDescription description, ServiceHostBase serviceHostBase, System.Collections.ObjectModel.Collection<ServiceEndpoint> endpoints, BindingParameterCollection parameters)
         {
         }
 
         void IServiceBehavior.ApplyDispatchBehavior(ServiceDescription description, ServiceHostBase serviceHostBase)
         {
             IErrorHandler errorHandler;
+            var serviceProvider = description.Behaviors.Find<ServiceProviderServiceBehavior>().ServiceProvider;
 
             try
             {
-                errorHandler = (IErrorHandler)Activator.CreateInstance(ErrorHandlerType);
+                errorHandler = (IErrorHandler)ActivatorUtilities.CreateInstance(serviceProvider, ErrorHandlerType);
             }
             catch (MissingMethodException e)
             {

Extensibility/ErrorHandling/ErrorLogging/Service/Program.cs

@@ -6,8 +6,13 @@
 //Enable CoreWCF Services, with metadata (WSDL) support
 builder.Services.AddServiceModelServices()
     .AddServiceModelMetadata()
+    .AddSingleton<IServiceBehavior, ServiceProviderServiceBehavior>()
     .AddSingleton<IServiceBehavior, UseRequestHeadersForMetadataAddressBehavior>();
 
+//Add logging
+builder.Logging.ClearProviders();
+builder.Logging.AddConsole();
+
 var app = builder.Build();
 
 app.UseServiceModel(builder =>

Extensibility/ErrorHandling/ErrorLogging/Service/ServiceProviderServiceBehavior.cs

@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.ObjectModel;
+using CoreWCF.Channels;
+
+//this class is used to get ServiceProvider reference as ServiceBehavior for DI 
+internal class ServiceProviderServiceBehavior : IServiceBehavior
+{
+    public ServiceProviderServiceBehavior(IServiceProvider serviceProvider)
+    {
+        ServiceProvider = serviceProvider;
+    }
+
+    public IServiceProvider ServiceProvider { get; }
+
+    public void AddBindingParameters(ServiceDescription serviceDescription, ServiceHostBase serviceHostBase, Collection<ServiceEndpoint> endpoints, BindingParameterCollection bindingParameters)
+    {
+    }
+
+    public void ApplyDispatchBehavior(ServiceDescription serviceDescription, ServiceHostBase serviceHostBase)
+    {
+
+    }
+
+    public void Validate(ServiceDescription serviceDescription, ServiceHostBase serviceHostBase)
+    {
+    }
+}