mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 00:13:12 +09:00
Close webpack middleware on shutdown
Call the .close method on the webpack-dev-middleware in order to properly shut it down.
This commit is contained in:
1 parent
701ff87bcd
commit
f1f9b4d020
1 file changed
+10
-3
@@ -36,6 +36,7 @@ let masterConfigPath;
|
|||||||
let stopAcceptingNewSessions = false;
|
let stopAcceptingNewSessions = false;
|
||||||
let debugEvents = new events.EventEmitter();
|
let debugEvents = new events.EventEmitter();
|
||||||
let pluginList = {};
|
let pluginList = {};
|
||||||
|
let devMiddleware;
|
||||||
|
|
||||||
// homebrew modules
|
// homebrew modules
|
||||||
const generateSSLcert = require("./src/generate_ssl_cert");
|
const generateSSLcert = require("./src/generate_ssl_cert");
|
||||||
@@ -371,6 +372,10 @@ async function shutdown() {
|
|||||||
|
|
||||||
stopAcceptingNewSessions = true;
|
stopAcceptingNewSessions = true;
|
||||||
|
|
||||||
|
if (devMiddleware) {
|
||||||
|
await new Promise((resolve, reject) => { devMiddleware.close(resolve); });
|
||||||
|
}
|
||||||
|
|
||||||
let disconnectTasks = [];
|
let disconnectTasks = [];
|
||||||
for (let controlConnection of controlConnections) {
|
for (let controlConnection of controlConnections) {
|
||||||
controlConnection.connector.setTimeout(masterConfig.get("master.connector_shutdown_timeout"));
|
controlConnection.connector.setTimeout(masterConfig.get("master.connector_shutdown_timeout"));
|
||||||
@@ -1636,14 +1641,16 @@ async function startServer() {
|
|||||||
|
|
||||||
// If we get here the command was run
|
// If we get here the command was run
|
||||||
|
|
||||||
|
// Start webpack development server if enabled
|
||||||
if (args.dev) {
|
if (args.dev) {
|
||||||
console.log("Development mode enabled");
|
console.log("Webpack development mode enabled");
|
||||||
const webpack = require("webpack");
|
const webpack = require("webpack");
|
||||||
const middleware = require("webpack-dev-middleware");
|
const webpackDevMiddleware = require("webpack-dev-middleware");
|
||||||
const webpackConfig = require("./webpack.config");
|
const webpackConfig = require("./webpack.config");
|
||||||
|
|
||||||
const compiler = webpack(webpackConfig({}));
|
const compiler = webpack(webpackConfig({}));
|
||||||
app.use(middleware(compiler, {}));
|
devMiddleware = webpackDevMiddleware(compiler, {});
|
||||||
|
app.use(devMiddleware);
|
||||||
}
|
}
|
||||||
|
|
||||||
let secondSigint = false;
|
let secondSigint = false;
|
||||||
|
|||||||
Reference in new issue
Block a user