unregister AppDomain.ProcessExit event handler after ActorSystem term…

…inates (akkadotnet#3846) * close akkadotnet#3735 - unregister AppDomain.ProcessExit event handler after ActorSystem terminates * fixed typo on save
Aaronontheweb · Feb 28, 2020 · ad50778 · ad50778
1 parent fc687b5
commit ad50778
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/core/Akka/Actor/CoordinatedShutdown.cs b/src/core/Akka/Actor/CoordinatedShutdown.cs
@@ -673,12 +673,10 @@ internal static void InitClrHook(ActorSystem system, Config conf, CoordinatedShu
             var runByClrShutdownHook = conf.GetBoolean("run-by-clr-shutdown-hook", false);
             if (runByClrShutdownHook)
             {
+                var exitTask = TerminateOnClrExit(coord);
                 // run all hooks during termination sequence
-                AppDomain.CurrentDomain.ProcessExit += (sender, args) =>
-                {
-                    // have to block, because if this method exits the process exits.
-                    coord.RunClrHooks().Wait(coord.TotalTimeout);
-                };
+                AppDomain.CurrentDomain.ProcessExit += exitTask;
+                system.WhenTerminated.ContinueWith(tr => { AppDomain.CurrentDomain.ProcessExit -= exitTask; });
 
                 coord.AddClrShutdownHook(() =>
                 {
@@ -702,5 +700,14 @@ internal static void InitClrHook(ActorSystem system, Config conf, CoordinatedShu
                 });
             }
         }
+
+        private static EventHandler TerminateOnClrExit(CoordinatedShutdown coord)
+        {
+            return (sender, args) =>
+            {
+                // have to block, because if this method exits the process exits.
+                coord.RunClrHooks().Wait(coord.TotalTimeout);
+            };
+        }
     }
 }