Skip to content

Commit 2347245

Browse files
committed
after merge
2 parents be7f0b7 + dc93e27 commit 2347245

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,4 @@ module.exports = function(grunt) {
135135
// For Heroku users only.
136136
// Docs: https://github.com/linnovate/mean/wiki/Deploying-on-Heroku
137137
grunt.registerTask('heroku:production', ['cssmin', 'uglify']);
138-
};
138+
};

server.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ var cluster = require('cluster');
1818
if ((cluster.isMaster) && (process.execArgv.indexOf('--debug') < 0) && (process.env.NODE_ENV!=='test') && (process.execArgv.indexOf('--singleProcess')<0)) {
1919
//if (cluster.isMaster) {
2020

21+
console.log('for real!');
2122
// Count the machine's CPUs
2223
var cpuCount = require('os').cpus().length;
2324

@@ -43,9 +44,10 @@ if ((cluster.isMaster) && (process.execArgv.indexOf('--debug') < 0) && (process.
4344
{
4445
workerId = cluster.worker.id;
4546
}
46-
mean.serve({ workerid: workerId /* more options placeholder*/ }, function (app) {
47-
var config = app.config.clean;
48-
var port = config.https && config.https.port ? config.https.port : config.http.port;
49-
console.log('Mean app started on port ' + port + ' (' + process.env.NODE_ENV + ') cluster.worker.id:', workerId);
50-
});
47+
// Creates and serves mean application
48+
mean.serve({ workerid: workerId /* more options placeholder*/ }, function (app) {
49+
var config = app.config.clean;
50+
var port = config.https && config.https.port ? config.https.port : config.http.port;
51+
console.log('Mean app started on port ' + port + ' (' + process.env.NODE_ENV + ') cluster.worker.id:', workerId);
52+
});
5153
}

0 commit comments

Comments
 (0)