Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-08 05:30:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

use build module instead of forking

Browse Source
This commit is contained in:
barisusakli
2016-12-13 15:43:20 +03:00
parent 53fe432d8a
commit c32e6aaabb
5 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/meta/css.js
View File

@@ -153,15 +153,13 @@ module.exports = function (Meta) {
};
function minify(source, paths, destination, callback) {
callback = callback || function () {};
less.render(source, {
paths: paths
}, function (err, lessOutput) {
if (err) {
winston.error('[meta/css] Could not minify LESS/CSS: ' + err.message);
if (typeof callback === 'function') {
callback(err);
}
return;
return callback(err);
}
postcss([ autoprefixer, clean() ]).process(lessOutput.css).then(function (result) {
@@ -171,19 +169,14 @@ module.exports = function (Meta) {
Meta.css[destination] = result.css;
// Save the compiled CSS in public/ so things like nginx can serve it
if (nconf.get('isPrimary') === 'true' && (nconf.get('local-assets') === undefined || nconf.get('local-assets') !== false)) {
if (nconf.get('local-assets') === undefined || nconf.get('local-assets') !== false) {
return Meta.css.commitToFile(destination, function () {
if (typeof callback === 'function') {
callback(null, result.css);
}
callback(null, result.css);
});
}
if (typeof callback === 'function') {
callback(null, result.css);
}
callback(null, result.css);
});
});
}

11
src/socket.io/admin.js
View File

@@ -62,14 +62,11 @@ SocketAdmin.reload = function (socket, data, callback) {
};
SocketAdmin.restart = function (socket, data, callback) {
// Rebuild assets and reload NodeBB
var child_process = require('child_process');
var build_worker = child_process.fork('app.js', ['--build'], {
cwd: path.join(__dirname, '../../'),
stdio: 'pipe'
});
require('../../build').buildAll(function (err) {
if (err) {
return callback(err)
}
build_worker.on('exit', function () {
events.log({
type: 'build',
uid: socket.uid,