Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(server): fix setupExitSignals usage #2181

Merged
merged 4 commits into from Aug 8, 2019
Merged

fix(server): fix setupExitSignals usage #2181

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ba22d5
fix(server): pass server data to exit signal setup as object
knagaitsev Aug 7, 2019
4d3637d
test(server): add exit signal tests
knagaitsev Aug 7, 2019
ef58382
style(test): fix lint problem
knagaitsev Aug 7, 2019
f99b27b
Merge branch 'master' into setupExitSignals-fix
evilebottnawi Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion bin/webpack-dev-server.js
View file
Open in desktop
Expand Up @@ -19,8 +19,11 @@ const getVersions = require('../lib/utils/getVersions');
const options = require('./options');

let server;
const serverData = {
server: null,
};

setupExitSignals(server);
setupExitSignals(serverData);

// Prefer the local installation of webpack-dev-server
if (importLocal(__filename)) {
Expand Down Expand Up @@ -98,6 +101,7 @@ function startDevServer(config, options) {

try {
server = new Server(compiler, options, log);
serverData.server = server;
} catch (err) {
if (err.name === 'ValidationError') {
log.error(colors.error(options.stats.colors, err.message));
Expand Down
6 changes: 3 additions & 3 deletions lib/utils/setupExitSignals.js
View file
Open in desktop
Expand Up @@ -2,11 +2,11 @@

const signals = ['SIGINT', 'SIGTERM'];

function setupExitSignals(server) {
function setupExitSignals(serverData) {
signals.forEach((signal) => {
process.on(signal, () => {
if (server) {
server.close(() => {
if (serverData.server) {
serverData.server.close(() => {
// eslint-disable-next-line no-process-exit
process.exit();
});
Expand Down