Fixed Brikkit continuing to run when Brickadia crashed or exited

n42k · Sep 14, 2019 · f0b2623 · f0b2623
1 parent 13ace74
commit f0b2623
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/brickadia.js b/brickadia.js
@@ -87,9 +87,8 @@ class Brickadia {
             process.exit();
         });
 
-        process.on('uncaughtException', err => {
+        process.on('uncaughtException', _err => {
             sp.kill();
-            throw err;
         });
     }
 

diff --git a/brikkit.js b/brikkit.js
@@ -43,6 +43,9 @@ class Brikkit {
         this._pluginSystem = new PluginSystem();
 
         this._brickadia.on('out', line => this._handleBrickadiaLine(line));
+        this._brickadia.on('close', () => {
+            throw new Error('Brickadia closed (probable crash)');
+        });
 
         this._terminal = new Terminal();
         this._terminal.on('out', line => {

diff --git a/server.js b/server.js
@@ -35,9 +35,10 @@ function sleep(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-process.on('uncaughtException', async err => {
+process.on('uncaughtException', err => {
     console.log(' --- SERVER END --- ');
-    stream.end();
+    console.log(err.stack);
 
     fs.appendFileSync(logFile, err.stack);
+    process.exit();
 });