diff --git a/src/meta/minifier.js b/src/meta/minifier.js index d34d9169a6..b76b16a668 100644 --- a/src/meta/minifier.js +++ b/src/meta/minifier.js @@ -168,7 +168,7 @@ function concat(data, callback) { actions.concat = concat; function minifyJS_batch(data, callback) { - async.each(data.files, function (fileObj, next) { + async.eachLimit(data.files, 100, function (fileObj, next) { fs.readFile(fileObj.srcPath, 'utf8', function (err, source) { if (err) { return next(err); diff --git a/src/widgets/admin.js b/src/widgets/admin.js index 8bd7b1b175..ddf3f3ad16 100644 --- a/src/widgets/admin.js +++ b/src/widgets/admin.js @@ -5,6 +5,7 @@ var path = require('path'); var async = require('async'); var nconf = require('nconf'); var benchpress = require('benchpressjs'); +var winston = require('winston'); var plugins = require('../plugins'); var groups = require('../groups'); @@ -85,7 +86,7 @@ function renderAdminTemplate(callback) { async.waterfall([ function (next) { async.parallel({ - source: async.apply(fs.readFile, path.resolve(nconf.get('views_dir'), 'admin/partials/widget-settings.tpl'), 'utf8'), + source: async.apply(getSource), groups: async.apply(groups.getNonPrivilegeGroups, 'groups:createtime', 0, -1), }, next); }, @@ -95,3 +96,12 @@ function renderAdminTemplate(callback) { }, ], callback); } + +function getSource(callback) { + fs.readFile(path.resolve(nconf.get('views_dir'), 'admin/partials/widget-settings.tpl'), 'utf8', function (err, source) { + if (err) { + winston.error(err); + } + callback(null, source || ''); + }); +}