From 4cd4414d197046c0434834a19f6d683f6ac5c0e7 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 23 Feb 2017 15:29:35 +0300
Subject: [PATCH] small change

---
 src/meta/blacklist.js |  2 +-
 src/meta/js.js        | 42 ++++++++++++++++++------------------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/meta/blacklist.js b/src/meta/blacklist.js
index c02f6fb198..a078b89815 100644
--- a/src/meta/blacklist.js
+++ b/src/meta/blacklist.js
@@ -44,8 +44,8 @@ Blacklist.save = function (rules, callback) {
 			db.set('ip-blacklist-rules', rules, next);
 		},
 		function (next) {
+			Blacklist.load(next);
 			pubsub.publish('blacklist:reload');
-			next();
 		}
 	], callback);
 };
diff --git a/src/meta/js.js b/src/meta/js.js
index 969239f0a8..90f757361a 100644
--- a/src/meta/js.js
+++ b/src/meta/js.js
@@ -129,10 +129,10 @@ module.exports = function (Meta) {
 			});
 		}, callback);
 	};
-	
+
 	function linkModules(callback) {
 		var modules = Meta.js.scripts.modules;
-		
+
 		async.eachLimit(Object.keys(modules), 1000, function (relPath, next) {
 			var filePath = path.join(__dirname, '../../', modules[relPath]);
 			var destPath = path.join(__dirname, '../../build/public/src/modules', relPath);
@@ -177,41 +177,35 @@ module.exports = function (Meta) {
 				next();
 			});
 		}, function (err) {
-			if (err) {
-				return callback(err);
-			}
-
-			callback(null, modules);
+			callback(err, modules);
 		});
 	}
-	
+
 	function clearModules(callback) {
 		var builtPaths = moduleDirs.map(function (p) {
 			return '../../build/public/src/' + p;
 		});
 		async.each(builtPaths, function (builtPath, next) {
 			rimraf(path.join(__dirname, builtPath), next);
-		}, callback);
+		}, function (err) {
+			callback(err);
+		});
 	}
 
 	Meta.js.buildModules = function (callback) {
-		clearModules(function (err) {
-			if (err) {
-				return callback(err);
-			}
-
-			if (global.env === 'development') {
-				return linkModules(callback);
-			}
-
-			getModuleList(function (err, modules) {
-				if (err) {
-					return callback(err);
+		async.waterfall([
+			clearModules,
+			function (next) {
+				if (global.env === 'development') {
+					return linkModules(callback);
 				}
 
-				minifyModules(modules, callback);
-			});
-		});
+				getModuleList(next);
+			},
+			function (modules, next) {
+				minifyModules(modules, next);
+			}
+		], callback);
 	};
 
 	Meta.js.linkStatics = function (callback) {