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.

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

Close server port on exit #823

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions bin/http-server
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,27 @@ function listen(port) {
}
}

// Set up "CTRL-C" hook, before printing out "Hit CTRL-C to stop the server"
function stopServer() {
server.close();
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The main purpose of this PR is to add this server.close(); line.

logger.info(chalk.red('http-server stopped.'));
process.exit();
}
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored from the common code below.


process.on('SIGINT', stopServer);
process.on('SIGTERM', stopServer);

if (process.platform === 'win32') {
require('readline').createInterface({
input: process.stdin,
output: process.stdout
}).on('SIGINT', function () {
process.emit('SIGINT');
});
}

logger.info('Hit CTRL-C to stop the server');

if (argv.o) {
const openHost = host === '0.0.0.0' ? '127.0.0.1' : host;
let openUrl = `${protocol}${openHost}:${port}`;
Expand All @@ -257,22 +277,3 @@ function listen(port) {
if (!argv.s) logger.info();
});
}

if (process.platform === 'win32') {
require('readline').createInterface({
input: process.stdin,
output: process.stdout
}).on('SIGINT', function () {
process.emit('SIGINT');
});
}
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved the block for Windows to the bottom, so that the reading order becomes natural.


process.on('SIGINT', function () {
logger.info(chalk.red('http-server stopped.'));
process.exit();
});

process.on('SIGTERM', function () {
logger.info(chalk.red('http-server stopped.'));
process.exit();
});