closed #2011

public/src/forum/admin/index.js

@@ -37,18 +37,45 @@ define('forum/admin/index', function() {
 		});
 
 		$('.restart').on('click', function() {
+			bootbox.confirm('Are you sure you wish to restart NodeBB?', function(confirm) {
+				if (confirm) {
+					app.alert({
+						timeout: 5000,
+						title: 'Restarting... <i class="fa fa-spin fa-refresh"></i>',
+						message: 'NodeBB is restarting.',
+						type: 'info'
+					});
+
+					$(window).one('action:reconnected', function() {
+						app.alertSuccess('NodeBB has successfully restarted.');
+					});
+
+					socket.emit('admin.restart');
+				}
+			});
+		});
+
+		$('.reload').on('click', function() {
 			app.alert({
-				timeout: 5000,
+				alert_id: 'instance_reload',
-				title: 'Restarting...',
+				title: 'Reloading... <i class="fa fa-spin fa-refresh"></i>',
 				message: 'NodeBB is restarting.',
-				type: 'info'
+				type: 'info',
+				timeout: 5000
 			});
 
-			$(window).one('action:reconnected', function() {
+			socket.emit('admin.reload', function(err) {
-				app.alertSuccess('NodeBB has successfully restarted.');
+				if (!err) {
+					app.alertSuccess('NodeBB has successfully reloaded.');
+				} else {
+					app.alert({
+						alert_id: 'instance_reload',
+						title: '[[global:alert.error]]',
+						message: err.message,
+						type: 'danger'
+					});
+				}
 			});
-
-			socket.emit('admin.restart');
 		});
 	};
 

src/meta.js

@@ -3,7 +3,8 @@
 var async = require('async'),
 	winston = require('winston'),
 	user = require('./user'),
-	groups = require('./groups');
+	groups = require('./groups'),
+	plugins = require('./plugins');
 
 
 (function (Meta) {
@@ -28,9 +29,13 @@ var async = require('async'),
 		});
 	};
 
-	Meta.reload = function(step) {
+	Meta.reload = function(callback) {
-		// 1. Reload plugins and associated routes
+		plugins.reload(function() {
-		// 2. Minify scripts and css, update cache buster
+			async.parallel([
+				async.apply(Meta.js.minify, false),
+				async.apply(Meta.css.minify)
+			], callback);
+		});
 	};
 
 	Meta.restart = function() {

src/socket.io/admin.js

@@ -38,6 +38,10 @@ SocketAdmin.before = function(socket, method, next) {
 	});
 };
 
+SocketAdmin.reload = function(socket, data, callback) {
+	meta.reload(callback);
+};
+
 SocketAdmin.restart = function(socket, data, callback) {
 	meta.restart();
 };