Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-28 02:09:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

closed #2179

Browse Source
This commit is contained in:
Julian Lam
2014-09-29 19:31:27 -04:00
parent 2b115e75c6
commit 343ff18014
3 changed files with 90 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app.js
View File

@@ -168,6 +168,11 @@ function start() {
meta.js.map = message.map;
winston.info('[cluster] Client-side javascript and mapping propagated to worker ' + cluster.worker.id);
break;
case 'css-propagate':
meta.css.cache = message.cache;
meta.css.acpCache = message.acpCache;
winston.info('[cluster] Stylesheet propagated to worker ' + cluster.worker.id);
break;
}
});

27
loader.js
View File

@@ -14,6 +14,10 @@ var nconf = require('nconf'),
js: {
cache: undefined,
map: undefined
},
css: {
cache: undefined,
acpCache: undefined
}
};
@@ -36,6 +40,14 @@ Loader.init = function() {
});
}
if (Loader.css.cache) {
worker.send({
action: 'css-propagate',
cache: Loader.css.cache,
acpCache: Loader.css.acpCache
});
}
worker.send('bind');
// Kill an instance in the shutdown queue
@@ -69,6 +81,21 @@ Loader.init = function() {
});
});
break;
case 'css-propagate':
Loader.css.cache = message.cache;
Loader.css.acpCache = message.acpCache;
var otherWorkers = Object.keys(cluster.workers).filter(function(worker_id) {
return parseInt(worker_id, 10) !== parseInt(worker.id, 10);
});
otherWorkers.forEach(function(worker_id) {
cluster.workers[worker_id].send({
action: 'css-propagate',
cache: message.cache,
acpCache: message.acpCache
});
});
break;
case 'listening':
if (message.primary) {
Loader.primaryWorker = parseInt(worker.id, 10);

97
src/meta/css.js
View File

@@ -24,47 +24,66 @@ module.exports = function(Meta) {
Meta.css.defaultBranding = {};
Meta.css.minify = function(callback) {
winston.info('[meta/css] Minifying LESS/CSS');
db.getObjectFields('config', ['theme:type', 'theme:id'], function(err, themeData) {
var themeId = (themeData['theme:id'] || 'nodebb-theme-vanilla'),
baseThemePath = path.join(nconf.get('themes_path'), (themeData['theme:type'] && themeData['theme:type'] === 'local' ? themeId : 'nodebb-theme-vanilla')),
paths = [
baseThemePath,
path.join(__dirname, '../../node_modules'),
path.join(__dirname, '../../public/vendor/fontawesome/less'),
path.join(__dirname, '../../public/vendor/bootstrap/less')
],
source = '@import "font-awesome";',
acpSource,
x;
if (!cluster.isWorker || process.env.cluster_setup === 'true') {
winston.info('[meta/css] Minifying LESS/CSS');
db.getObjectFields('config', ['theme:type', 'theme:id'], function(err, themeData) {
var themeId = (themeData['theme:id'] || 'nodebb-theme-vanilla'),
baseThemePath = path.join(nconf.get('themes_path'), (themeData['theme:type'] && themeData['theme:type'] === 'local' ? themeId : 'nodebb-theme-vanilla')),
paths = [
baseThemePath,
path.join(__dirname, '../../node_modules'),
path.join(__dirname, '../../public/vendor/fontawesome/less'),
path.join(__dirname, '../../public/vendor/bootstrap/less')
],
source = '@import "font-awesome";',
acpSource,
x;
plugins.lessFiles = filterMissingFiles(plugins.lessFiles);
for(x=0; x<plugins.lessFiles.length; ++x) {
source += '\n@import ".' + path.sep + plugins.lessFiles[x] + '";';
}
plugins.cssFiles = filterMissingFiles(plugins.cssFiles);
for(x=0; x<plugins.cssFiles.length; ++x) {
source += '\n@import (inline) ".' + path.sep + plugins.cssFiles[x] + '";';
}
source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui-1.10.4.custom.min.css";';
source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";';
acpSource = '\n@import "..' + path.sep + 'public/less/admin/admin";\n' + source;
source = '@import "./theme";\n' + source;
async.parallel([
function(next) {
minify(source, paths, 'cache', next);
},
function(next) {
minify(acpSource, paths, 'acpCache', next);
plugins.lessFiles = filterMissingFiles(plugins.lessFiles);
for(x=0; x<plugins.lessFiles.length; ++x) {
source += '\n@import ".' + path.sep + plugins.lessFiles[x] + '";';
}
], callback);
});
plugins.cssFiles = filterMissingFiles(plugins.cssFiles);
for(x=0; x<plugins.cssFiles.length; ++x) {
source += '\n@import (inline) ".' + path.sep + plugins.cssFiles[x] + '";';
}
source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui-1.10.4.custom.min.css";';
source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";';
acpSource = '\n@import "..' + path.sep + 'public/less/admin/admin";\n' + source;
source = '@import "./theme";\n' + source;
async.parallel([
function(next) {
minify(source, paths, 'cache', next);
},
function(next) {
minify(acpSource, paths, 'acpCache', next);
}
], function(err, minified) {
// Propagate to other workers
if (cluster.isWorker) {
process.send({
action: 'css-propagate',
cache: minified[0],
acpCache: minified[1]
});
}
if (typeof callback === 'function') {
callback();
}
});
});
} else {
if (typeof callback === 'function') {
callback();
}
}
};
Meta.css.commitToFile = function(filename) {
@@ -123,7 +142,7 @@ module.exports = function(Meta) {
}
if (typeof callback === 'function') {
callback();
callback(null, css);
}
});
}