From 61d92a6910888829e4f2e35e510d695ca4a438f6 Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Thu, 9 Apr 2020 15:06:44 +0200
Subject: [PATCH] Rename master plugin onExit hook to onShutdown

Rename the onExit hook for master plugins to onShutdown to better
reflect when it is invoked.
---
 lib/plugin.js                      | 2 +-
 master.js                          | 4 ++--
 plugins/research_sync/master.js    | 2 +-
 plugins/subspace_storage/master.js | 2 +-
 test/lib/plugin.js                 | 4 +++-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/plugin.js b/lib/plugin.js
index abd97ad6..41661db3 100644
--- a/lib/plugin.js
+++ b/lib/plugin.js
@@ -127,7 +127,7 @@ class BaseMasterPlugin {
 	/**
 	 * Called when the master server is shutting down
 	 */
-	async onExit() { }
+	async onShutdown() { }
 }
 
 /**
diff --git a/master.js b/master.js
index af859fdb..f35d8427 100644
--- a/master.js
+++ b/master.js
@@ -250,8 +250,8 @@ async function shutdown() {
 
 		for (let [pluginName, masterPlugin] of masterPlugins) {
 			let startTime = Date.now();
-			await masterPlugin.onExit();
-			console.log(`Plugin ${pluginName} exited in ${Date.now() - startTime}ms`);
+			await masterPlugin.onShutdown();
+			console.log(`Plugin ${pluginName} shutdown in ${Date.now() - startTime}ms`);
 		}
 
 		stopAcceptingNewSessions = true;
diff --git a/plugins/research_sync/master.js b/plugins/research_sync/master.js
index deaf10c4..84a00db4 100644
--- a/plugins/research_sync/master.js
+++ b/plugins/research_sync/master.js
@@ -12,7 +12,7 @@ class MasterPlugin extends plugin.BaseMasterPlugin {
 		this.progressToBroadcast = new Set();
 	}
 
-	async onExit() {
+	async onShutdown() {
 		if (this.progressBroadcastId) {
 			clearTimeout(this.progressBroadcastId);
 		}
diff --git a/plugins/subspace_storage/master.js b/plugins/subspace_storage/master.js
index 3170af23..21e44938 100644
--- a/plugins/subspace_storage/master.js
+++ b/plugins/subspace_storage/master.js
@@ -177,7 +177,7 @@ class MasterPlugin extends plugin.BaseMasterPlugin {
 		}
 	}
 
-	async onExit() {
+	async onShutdown() {
 		clearInterval(this.autosaveId);
 		clearInterval(this.doleMagicId);
 		await saveDatabase(this.master.config, this.items);
diff --git a/test/lib/plugin.js b/test/lib/plugin.js
index 4072aebf..92cd772a 100644
--- a/test/lib/plugin.js
+++ b/test/lib/plugin.js
@@ -16,6 +16,7 @@ describe("lib/plugin", function() {
 			await instancePlugin.init();
 		})
 		it("should define defaults for hooks", async function() {
+			await instancePlugin.onMetrics();
 			await instancePlugin.onStart();
 			await instancePlugin.onStop();
 			instancePlugin.onExit();
@@ -30,7 +31,8 @@ describe("lib/plugin", function() {
 			await masterPlugin.init();
 		})
 		it("should define defaults for hooks", async function() {
-			await masterPlugin.onExit();
+			await masterPlugin.onMetrics();
+			await masterPlugin.onShutdown();
 		})
 	});