Simp-O-Matic

commit 9a837f212e3b3fbb0d88987b28e75445590ea154
parent 64c3733905239f1f555fc891cc2046edb11fd211
Author: Demonstrandum <moi@knutsen.co>
Date:   Mon, 23 Mar 2020 13:23:35 +0000

Added beforeExit clause to shutdown sequence.

Diffstat:
M
lib/main.ts
 | 
39
+++++++++++++++++++++++----------------

1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/lib/main.ts b/lib/main.ts
@@ -439,30 +439,37 @@ let CLIENT: Client = null;
 function on_termination(error_type) {
 	// Back-up the resultant CONFIG to an external file.
 	console.warn(`Received ${error_type}, shutting down.`);
-	console.log('Cleaning up...');
-	write_file(`${process.cwd()}/export-exit.json`, export_config(GLOBAL_CONFIG, {}));
-	pastebin_update(export_config(GLOBAL_CONFIG, {}))
-		.then(_ => console.log('Finished pastebin update.'))
-		.catch(e => console.warn('Pastebin not saved!', e));
-	// Message all system channels.
-	console.log('Sending system messages.');
-	system_message(CLIENT,
-		`Bot got \`${error_type}\` signal.\n`
-		+ `**Shutting down...**`);
+
+	if (error_type === 'exit')
+		write_file(
+			`${process.cwd()}/export-exit.json`,
+			export_config(GLOBAL_CONFIG, {}));
+
+	if (error_type === 'beforeExit') {
+		pastebin_update(export_config(GLOBAL_CONFIG, {}))
+			.then(_ => console.log('Finished pastebin update.'))
+			.catch(e => console.warn('Pastebin not saved!', e));
+		// Message all system channels.
+		console.log('Sending system messages.');
+		system_message(CLIENT,
+			`Bot got \`${error_type}\` signal.\n`
+			+ `**Shutting down...**`);
+	}
 	// Make sure we saved ok.
 	setTimeout(() => {
 		console.log('Clean finished.');
 		process.exit(0);
-	}, 3000).unref();
+	}, 7000).unref();  // If we haven't exited in 7s, just exit anyway.
 }
 
 // Handle exits.
 process
-	.on('SIGTERM', on_termination.bind(this, 'SIGTERM'))
-	.on('SIGINT',  on_termination.bind(this, 'SIGINT'))
-	.on('exit',    on_termination.bind(this, 'exit'))
-	.on('SIGUSR1', on_termination.bind(this, 'SIGUSR1'))
-	.on('SIGUSR2', on_termination.bind(this, 'SIGUSR2'))
+	.on('SIGTERM',    on_termination.bind(this, 'SIGTERM'))
+	.on('SIGINT',     on_termination.bind(this, 'SIGINT'))
+	.on('beforeExit', on_termination.bind(this, 'beforeExit'))
+	.on('exit',       on_termination.bind(this, 'exit'))
+	.on('SIGUSR1',    on_termination.bind(this, 'SIGUSR1'))
+	.on('SIGUSR2',    on_termination.bind(this, 'SIGUSR2'))
 	.on('uncaughtException', on_termination.bind(this, 'exception'));
 
 // CONFIG will eventually update to the online version.