use IDisposable

neo-project · Oct 29, 2019 · ce807ba · ce807ba
1 parent 3f632ea
commit ce807ba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/neo/NeoSystem.cs b/neo/NeoSystem.cs
@@ -44,7 +44,10 @@ public void Dispose()
         {
             RpcServer?.Dispose();
             EnsureStoped(LocalNode);
-            Plugin.NotifyPluginsToShutdown();
+            foreach (var p in Plugin.Plugins)
+            {
+                p.Dispose();
+            }
             // Dispose will call ActorSystem.Terminate()
             ActorSystem.Dispose();
             ActorSystem.WhenTerminated.Wait();

diff --git a/neo/Plugins/Plugin.cs b/neo/Plugins/Plugin.cs
@@ -8,7 +8,7 @@
 
 namespace Neo.Plugins
 {
-    public abstract class Plugin
+    public abstract class Plugin : IDisposable
     {
         public static readonly List<Plugin> Plugins = new List<Plugin>();
         private static readonly List<ILogPlugin> Loggers = new List<ILogPlugin>();
@@ -62,10 +62,6 @@ protected virtual void OnPluginsLoaded()
         {
         }
 
-        protected virtual void OnShutdown()
-        {
-        }
-
         private static void ConfigWatcher_Changed(object sender, FileSystemEventArgs e)
         {
             foreach (var plugin in Plugins)
@@ -116,12 +112,6 @@ internal static void NotifyPluginsLoadedAfterSystemConstructed()
                 plugin.OnPluginsLoaded();
         }
 
-        internal static void NotifyPluginsToShutdown()
-        {
-            foreach (var plugin in Plugins)
-                plugin.OnShutdown();
-        }
-
         protected void Log(string message, LogLevel level = LogLevel.Info)
         {
             Log($"{nameof(Plugin)}:{Name}", level, message);
@@ -179,5 +169,9 @@ private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEven
                 return null;
             }
         }
+
+        public virtual void Dispose()
+        {
+        }
     }
 }