Skip to content

Fix multiple instances bug #29

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

Merged
merged 1 commit into from
Dec 5, 2013
Merged

Fix multiple instances bug #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@ module.exports = function(grunt) {
'express:custom_output', 'nodeunit:custom_output', 'express:custom_output:stop',
'express:stoppable', 'express:stoppable:stop', 'nodeunit:stoppable',

// Multiple consecutive starts/stops of the same server
'express:custom_delay', 'nodeunit:custom_delay', 'express:custom_delay:stop',
'express:custom_delay', 'nodeunit:custom_delay', 'express:custom_delay:stop',
'express:custom_delay', 'nodeunit:custom_delay', 'express:custom_delay:stop',

// Multiple servers
'express:custom_port', 'express:defaults',
'nodeunit:defaults', 'nodeunit:custom_port',
Expand Down
23 changes: 15 additions & 8 deletions tasks/lib/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@ module.exports = function(grunt, target) {
process._servers = {};
}

var backup = null;
var done = null;
var server = process._servers[target]; // Store server between live reloads to close/restart express
var backup = null;
var startdone = null;
var stopdone = null;
var server = process._servers[target]; // Store server between live reloads to close/restart express

var finished = function() {
if (done) {
done();
if (startdone) {
startdone();

done = null;
startdone = null;
}
};

Expand Down Expand Up @@ -50,7 +51,7 @@ module.exports = function(grunt, target) {

grunt.log.writeln('Starting '.cyan + (options.background ? 'background' : 'foreground') + ' Express server');

done = grunt.task.current.async();
startdone = grunt.task.current.async();

// Set PORT for new processes
process.env.PORT = options.port;
Expand All @@ -71,7 +72,12 @@ module.exports = function(grunt, target) {
args: options.args,
env: process.env,
fallback: options.fallback
}, finished);
}, function (error, result, code) {
if (stopdone) {
stopdone();
}
finished();
});

if (options.delay) {
setTimeout(finished, options.delay);
Expand Down Expand Up @@ -102,6 +108,7 @@ module.exports = function(grunt, target) {
if (server && server.kill) {
grunt.log.writeln('Stopping'.red + ' Express server');

stopdone = grunt.task.current.async();
server.kill('SIGTERM');
process.removeAllListeners();
server = process._servers[target] = null;
Expand Down