Merge branch 'master' into abp-8.0.5

AElfProject · Nov 13, 2024 · 6d6354f · 6d6354f
2 parents d35d7b1 + a390b4d
commit 6d6354f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/AElf.ExceptionHandler.ABP/AElfExceptionHandlerHostBuilderExtensions.cs b/AElf.ExceptionHandler.ABP/AElfExceptionHandlerHostBuilderExtensions.cs
@@ -1,16 +1,24 @@
 using Autofac;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
 namespace AElf.ExceptionHandler.ABP;
 
 public static class AElfExceptionHandlerHostBuilderExtensions
 {
+    public static IList<ServiceDescriptor> ExceptionHandlerServices { get; set; } = new List<ServiceDescriptor>();
     public static IHostBuilder UseAElfExceptionHandler(this IHostBuilder hostBuilder)
     {
         return hostBuilder.ConfigureServices((_, services) =>
         {
             hostBuilder.ConfigureContainer<ContainerBuilder>((_, builder) =>
             {
+                // Register the exception handler services
+                foreach (var serviceDescriptor in ExceptionHandlerServices)
+                {
+                    services.Add(serviceDescriptor);
+                }
+
                 AutofacRegistration.Register(builder, services, null);
             });
         });

diff --git a/AElf.ExceptionHandler.ABP/AOPExceptionModule.cs b/AElf.ExceptionHandler.ABP/AOPExceptionModule.cs
@@ -21,6 +21,8 @@ public override void PostConfigureServices(ServiceConfigurationContext context)
     {
         base.PostConfigureServices(context);
         context.Services.OnRegistered(RegisterExceptionHandlerIfNeeded);
+        //remove all services that are satisfies ShouldIntercept. To be registered again later.
+        AElfExceptionHandlerHostBuilderExtensions.ExceptionHandlerServices = context.Services.RemoveAll(s => s.ImplementationType != null && ShouldIntercept(s.ImplementationType));
     }
 
     private static void RegisterExceptionHandlerIfNeeded(IOnServiceRegistredContext context)

diff --git a/AElf.ExceptionHandler.ABP/AutofacRegistration.cs b/AElf.ExceptionHandler.ABP/AutofacRegistration.cs
@@ -317,12 +317,6 @@ public static void Register(
                 {
                     continue;
                 }
-
-                // Class type are already registered properly and can be ignored
-                if (descriptor.ServiceType.IsClass)
-                {
-                    continue;
-                }
             }
 
             if (implementationType != null)