work-in-progress commit to get cluster module working with loader.js

loader.js

@@ -2,109 +2,147 @@
 
 var	nconf = require('nconf'),
 	fs = require('fs'),
-	pidFilePath = __dirname + '/pidfile',
+	cluster = require('cluster'),
-	output = fs.openSync(__dirname + '/logs/output.log', 'a'),
+	numCPUs = require('os').cpus().length;
-	start = function() {
-		var	nbb_start = function(callback) {
-				if (timesStarted > 3) {
-					console.log('\n[loader] Experienced three start attempts in 10 seconds, most likely an error on startup. Halting.');
-					return nbb_stop();
-				}
 
-				timesStarted++;
+	/* TODO
-				if (startTimer) {
+	    * pidFile and reset timer
-					clearTimeout(startTimer);
+	    * logging
-				}
+	    * handling SIGHUP
-				startTimer = setTimeout(resetTimer, 1000*10);
+	    * restart signal from child
+	*/
+
+	// pidFilePath = __dirname + '/pidfile',
+	// output = fs.openSync(__dirname + '/logs/output.log', 'a'),
+	// start = function() {
+	// 	var	nbb_start = function(callback) {
+	// 			if (timesStarted > 3) {
+	// 				console.log('\n[loader] Experienced three start attempts in 10 seconds, most likely an error on startup. Halting.');
+	// 				return nbb_stop();
+	// 			}
+
+	// 			timesStarted++;
+	// 			if (startTimer) {
+	// 				clearTimeout(startTimer);
+	// 			}
+	// 			startTimer = setTimeout(resetTimer, 1000*10);
+
+	// 			if (nbb) {
+	// 				nbbOld = nbb;
+	// 			}
+
+	// 			nbb = require('child_process').fork('./app', process.argv.slice(2), {
+	// 				env: process.env
+	// 			});
+
+	// 			nbb.on('message', function(message) {
+	// 				if (message && typeof message === 'object' && message.action) {
+	// 					switch (message.action) {
+	// 						case 'ready':
+	// 							if (!callback) return nbb.send('bind');
+	// 							callback();
+	// 						break;
+	// 						case 'restart':
+	// 							nbb_restart();
+	// 						break;
+	// 					}
+	// 				}
+	// 			});
+
+	// 			nbb.on('exit', function(code, signal) {
+	// 				if (code) {
+	// 					nbb_start();
+	// 				} else {
+	// 					nbb_stop();
+	// 				}
+	// 			});
+	// 		},
+	// 		nbb_stop = function() {
+	// 			if (startTimer) {
+	// 				clearTimeout(startTimer);
+	// 			}
+
+	// 			nbb.kill();
+	// 			if (fs.existsSync(pidFilePath)) {
+	// 				var	pid = parseInt(fs.readFileSync(pidFilePath, { encoding: 'utf-8' }), 10);
+	// 				if (process.pid === pid) {
+	// 					fs.unlinkSync(pidFilePath);
+	// 				}
+	// 			}
+	// 		},
+	// 		nbb_restart = function() {
+	// 			nbb_start(function() {
+	// 				nbbOld.removeAllListeners('exit').on('exit', function() {
+	// 					nbb.send('bind');
+	// 				});
+	// 				nbbOld.kill();
+	// 			});
+	// 		},
+	// 		resetTimer = function() {
+	// 			clearTimeout(startTimer);
+	// 			timesStarted = 0;
+	// 		},
+	// 		timesStarted = 0,
+	// 		startTimer;
+
+	// 	process.on('SIGINT', nbb_stop);
+	// 	process.on('SIGTERM', nbb_stop);
+	// 	process.on('SIGHUP', nbb_restart);
+
+	// 	nbb_start();
+	// },
+	// nbb, nbbOld;
+
+nconf.argv();
+
+cluster.setupMaster({
+	exec: "app.js",
+	silent: true
+});
 
-				if (nbb) {
+for(var x=0;x<numCPUs;x++) {
-					nbbOld = nbb;
+	cluster.fork();
 }
 
-				nbb = require('child_process').fork('./app', process.argv.slice(2), {
+cluster.on('exit', function(worker, code, signal) {
-					env: process.env
+	console.log('worker ' + worker.process.pid + ' died');
 });
 
-				nbb.on('message', function(message) {
+Object.keys(cluster.workers).forEach(function(id) {
+	cluster.workers[id].on('message', function(message) {
 		if (message && typeof message === 'object' && message.action) {
 			switch (message.action) {
 				case 'ready':
-								if (!callback) return nbb.send('bind');
+					cluster.workers[id].send('bind');
-								callback();
-							break;
-							case 'restart':
-								nbb_restart();
 				break;
+				// case 'restart':
+				// 	nbb_restart();
+				// break;
 			}
 		}
 	});
-
-				nbb.on('exit', function(code, signal) {
-					if (code) {
-						nbb_start();
-					} else {
-						nbb_stop();
-					}
 });
-			},
-			nbb_stop = function() {
-				if (startTimer) {
-					clearTimeout(startTimer);
-				}
-
-				nbb.kill();
-				if (fs.existsSync(pidFilePath)) {
-					var	pid = parseInt(fs.readFileSync(pidFilePath, { encoding: 'utf-8' }), 10);
-					if (process.pid === pid) {
-						fs.unlinkSync(pidFilePath);
-					}
-				}
-			},
-			nbb_restart = function() {
-				nbb_start(function() {
-					nbbOld.removeAllListeners('exit').on('exit', function() {
-						nbb.send('bind');
-					});
-					nbbOld.kill();
-				});
-			},
-			resetTimer = function() {
-				clearTimeout(startTimer);
-				timesStarted = 0;
-			},
-			timesStarted = 0,
-			startTimer;
-
-		process.on('SIGINT', nbb_stop);
-		process.on('SIGTERM', nbb_stop);
-		process.on('SIGHUP', nbb_restart);
-
-		nbb_start();
-	},
-	nbb, nbbOld;
-
-nconf.argv();
 
 // Start the daemon!
-if (nconf.get('daemon') !== false) {
+// if (nconf.get('daemon') !== false) {
-	// Check for a still-active NodeBB process
+// 	// Check for a still-active NodeBB process
-	if (fs.existsSync(pidFilePath)) {
+// 	if (fs.existsSync(pidFilePath)) {
-		try {
+// 		try {
-			var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
+// 			var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
-			process.kill(pid, 0);
+// 			process.kill(pid, 0);
-			process.exit();
+// 			process.exit();
-		} catch (e) {
+// 		} catch (e) {
-			fs.unlinkSync(pidFilePath);
+// 			fs.unlinkSync(pidFilePath);
-		}
+// 		}
-	}
+// 	}
 
-	// Daemonize and record new pid
+// 	// Daemonize and record new pid
-	require('daemon')({
+// 	require('daemon')({
-		stdout: output
+// 		stdout: output
-	});
+// 	});
-	fs.writeFile(__dirname + '/pidfile', process.pid);
+// 	fs.writeFile(__dirname + '/pidfile', process.pid);
 
-	start();
+// 	start();
-} else {
+// } else {
-	start();
+// 	start();
-}
+// }

src/middleware/index.js

@@ -22,6 +22,7 @@ var utils = require('./../../public/src/utils'),
 	multipart = require('connect-multiparty'),
 	csrf = require('csurf'),
 	session = require('express-session'),
+	cluster = require('cluster'),
 
 	relativePath,
 	themesPath;
@@ -128,7 +129,13 @@ module.exports = function(app, data) {
 	routeCurrentTheme(app, data.currentThemeId, data.themesData);
 	routeThemeScreenshots(app, data.themesData);
 
+	if (cluster.worker.id === 1) {
 		meta.templates.compile();
+	} else {
+		setTimeout(function() {
+			emitter.emit('templates:compiled');
+		}, 1000);
+	}
 
 	return middleware;
 };

src/routes/index.js

@@ -198,13 +198,6 @@ module.exports = function(app, middleware) {
 
 	// Add plugin routes
 	plugins.reloadRoutes();
-	// plugins.ready(function() {
-	// 	plugins.fireHook('static:app.load', pluginRouter, middleware, controllers, function() {
-
-
-
-	// 	});
-	// });
 };
 
 function handleErrors(err, req, res, next) {

src/webserver.js

@@ -6,6 +6,7 @@ var path = require('path'),
 	server,
 	winston = require('winston'),
 	async = require('async'),
+	cluster = require('cluster'),
 
 	emailer = require('./emailer'),
 	db = require('./database'),
@@ -39,13 +40,19 @@ if(nconf.get('ssl')) {
 	auth.registerApp(app);
 	emailer.registerApp(app);
 	notifications.init();
+	
+	if (cluster.worker.id === 1) {
 		user.startJobs();
+	}
 
 	// Preparation dependent on plugins
 	plugins.ready(function() {
 		meta.js.minify(app.enabled('minification'));
 		meta.css.minify();
+		
+		if (cluster.worker.id === 1) {
 			meta.sounds.init();
+		}
 	});
 
 	async.parallel({