Merge branch 'master' of https://github.com/designcreateplay/NodeBB

loader.js

@@ -14,10 +14,7 @@ var	nconf = require('nconf'),
 
 				nbb.on('message', function(cmd) {
 					if (cmd === 'nodebb:restart') {
-						nbb.on('exit', function() {
+						nbb_restart();
-							nbb_start();
-						});
-						nbb.kill();
 					}
 				});
 			},
@@ -29,10 +26,17 @@ var	nconf = require('nconf'),
 						fs.unlinkSync(pidFilePath);
 					}
 				}
+			},
+			nbb_restart = function() {
+				nbb.on('exit', function() {
+					nbb_start();
+				});
+				nbb.kill();
 			};
 
 		process.on('SIGINT', nbb_stop);
 		process.on('SIGTERM', nbb_stop);
+		process.on('SIGHUP', nbb_restart);
 
 		nbb_start();
 	},

nodebb

@@ -9,6 +9,7 @@ case "$1" in
 		echo "Starting NodeBB";
 		echo "  \"./nodebb stop\" to stop the NodeBB server";
 		echo "  \"./nodebb log\" to view server output";
+		echo "" > ./logs/output.log;
 		node loader -d "$@"
 		;;
 
@@ -17,7 +18,13 @@ case "$1" in
 		kill `cat pidfile`;
 		;;
 
+	reload|restart)
+		echo "Restarting NodeBB.";
+		kill -1 `cat pidfile`;
+		;;
+
 	log)
+		clear;
 		tail -F ./logs/output.log;
 		;;
 
@@ -54,11 +61,13 @@ case "$1" in
 
 	*)
 		echo "Welcome to NodeBB"
-		echo $"Usage: $0 {start|stop|log|setup|reset|upgrade|dev|watch}"
+		echo $"Usage: $0 {start|stop|reload|restart|log|setup|reset|upgrade|dev|watch}"
 		echo ''
 		column -s '	' -t <<< '
 		start	Start the NodeBB server
 		stop	Stops the NodeBB server
+		reload	Restarts NodeBB
+		restart	Restarts NodeBB
 		log	Opens the logging interface (useful for debugging)
 		setup	Runs the NodeBB setup script
 		reset	Disables all plugins, restores the default theme.