mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 15:33:12 +09:00
Improve error reporting at startup
Add StartupError that differentiates unhandled errors from errors with known causes and use it to only print the "please report" banner when an unhandled error occurs. Also makes the error reporting more visible in the console.
This commit is contained in:
1 parent
6ee84c41bf
commit
84f48e36f4
1 file changed
+43
-8
@@ -857,6 +857,29 @@ async function getPlugins(){
|
|||||||
return plugins;
|
return plugins;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Errror class for known errors occuring during startup
|
||||||
|
class StartupError extends Error { }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calls listen on server capturing any errors that occurs
|
||||||
|
* binding to the port.
|
||||||
|
*/
|
||||||
|
function listen(server, ...args) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
function wrapError(err) {
|
||||||
|
reject(new StartupError(
|
||||||
|
`Server listening failed: ${err.message}`
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
server.once('error', wrapError);
|
||||||
|
server.listen(...args, () => {
|
||||||
|
server.off('error', wrapError);
|
||||||
|
resolve();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
async function startServer() {
|
async function startServer() {
|
||||||
// Set the process title, shows up as the title of the CMD window on windows
|
// Set the process title, shows up as the title of the CMD window on windows
|
||||||
// and as the process name in ps/top on linux.
|
// and as the process name in ps/top on linux.
|
||||||
@@ -921,7 +944,7 @@ async function startServer() {
|
|||||||
// Only start listening for connections after all plugins have loaded
|
// Only start listening for connections after all plugins have loaded
|
||||||
if (httpPort) {
|
if (httpPort) {
|
||||||
let httpServer = require("http").Server(app);
|
let httpServer = require("http").Server(app);
|
||||||
httpServer.listen(httpPort);
|
await listen(httpServer, httpPort);
|
||||||
console.log("Listening for HTTP on port %s...", httpServer.address().port);
|
console.log("Listening for HTTP on port %s...", httpServer.address().port);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -932,15 +955,16 @@ async function startServer() {
|
|||||||
privateKey = await fs.readFile(config.sslPrivKey);
|
privateKey = await fs.readFile(config.sslPrivKey);
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(`Error loading ssl certificate: ${err.message}`);
|
throw new StartupError(
|
||||||
await shutdown()
|
`Error loading ssl certificate: ${err.message}`
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
let httpsServer = require("https").createServer({
|
let httpsServer = require("https").createServer({
|
||||||
key: privateKey,
|
key: privateKey,
|
||||||
cert: certificate
|
cert: certificate
|
||||||
}, app)
|
}, app)
|
||||||
httpsServer.listen(httpsPort);
|
await listen(httpsServer, httpsPort);
|
||||||
console.log("Listening for HTTPS on port %s...", httpsServer.address().port);
|
console.log("Listening for HTTPS on port %s...", httpsServer.address().port);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -949,10 +973,21 @@ module.exports = app;
|
|||||||
|
|
||||||
if (module === require.main) {
|
if (module === require.main) {
|
||||||
startServer().catch(err => {
|
startServer().catch(err => {
|
||||||
console.error(
|
if (!(err instanceof StartupError)) {
|
||||||
"Unexpected error occured while starting master, please report\n"+
|
console.error(`
|
||||||
"it to https://github.com/clusterio/factorioClusterio/issues"
|
+---------------------------------------------------------------+
|
||||||
);
|
| Unexpected error occured while starting master, please report |
|
||||||
|
| it to https://github.com/clusterio/factorioClusterio/issues |
|
||||||
|
+---------------------------------------------------------------+`
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
console.error(`
|
||||||
|
+----------------------------------+
|
||||||
|
| Unable to to start master server |
|
||||||
|
+----------------------------------+`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
console.error(err);
|
console.error(err);
|
||||||
return shutdown();
|
return shutdown();
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user