From 9d0dc3570314f376a8e32bcbb50acafb6a42f2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 4 Oct 2016 20:10:59 +0300 Subject: [PATCH] closes #5081 --- src/meta.js | 6 +++--- src/meta/css.js | 28 ++++++++++++++-------------- src/meta/dependencies.js | 19 ++++++++++--------- src/meta/errors.js | 10 ++++------ src/meta/js.js | 20 ++++++++++---------- src/meta/logs.js | 6 +++--- src/meta/settings.js | 4 ++-- src/meta/sounds.js | 2 +- src/meta/tags.js | 10 +++++----- src/meta/templates.js | 28 ++++++++++++++-------------- src/meta/themes.js | 17 ++++++++--------- src/posts/cache.js | 5 ++--- src/views/admin/advanced/cache.tpl | 19 ++++++++++++++++++- 13 files changed, 94 insertions(+), 80 deletions(-) diff --git a/src/meta.js b/src/meta.js index 2aca05f308..948d2aaf70 100644 --- a/src/meta.js +++ b/src/meta.js @@ -2,11 +2,9 @@ var async = require('async'); var winston = require('winston'); - var os = require('os'); var nconf = require('nconf'); -var user = require('./user'); -var groups = require('./groups'); + var pubsub = require('./pubsub'); var utils = require('../public/src/utils'); @@ -28,6 +26,8 @@ var utils = require('../public/src/utils'); /* Assorted */ Meta.userOrGroupExists = function(slug, callback) { + var user = require('./user'); + var groups = require('./groups'); slug = utils.slugify(slug); async.parallel([ async.apply(user.existsBySlug, slug), diff --git a/src/meta/css.js b/src/meta/css.js index 284effeceb..03779c1af6 100644 --- a/src/meta/css.js +++ b/src/meta/css.js @@ -1,19 +1,19 @@ 'use strict'; -var winston = require('winston'), - nconf = require('nconf'), - fs = require('fs'), - path = require('path'), - less = require('less'), - async = require('async'), - autoprefixer = require('autoprefixer'), - postcss = require('postcss'), - - plugins = require('../plugins'), - emitter = require('../emitter'), - db = require('../database'), - file = require('../file'), - utils = require('../../public/src/utils'); +var winston = require('winston'); +var nconf = require('nconf'); +var fs = require('fs'); +var path = require('path'); +var less = require('less'); +var async = require('async'); +var autoprefixer = require('autoprefixer'); +var postcss = require('postcss'); + +var plugins = require('../plugins'); +var emitter = require('../emitter'); +var db = require('../database'); +var file = require('../file'); +var utils = require('../../public/src/utils'); module.exports = function(Meta) { diff --git a/src/meta/dependencies.js b/src/meta/dependencies.js index 7da86113cf..a1d9b418a7 100644 --- a/src/meta/dependencies.js +++ b/src/meta/dependencies.js @@ -1,20 +1,21 @@ 'use strict'; -var path = require('path'), - fs = require('fs'), - async = require('async'), - semver = require('semver'), - winston = require('winston'), +var path = require('path'); +var fs = require('fs'); +var async = require('async'); +var semver = require('semver'); +var winston = require('winston'); - pkg = require('../../package.json'); +var pkg = require('../../package.json'); module.exports = function(Meta) { Meta.dependencies = {}; Meta.dependencies.check = function(callback) { - var modules = Object.keys(pkg.dependencies), - depsOutdated = false, - depsMissing = false; + var modules = Object.keys(pkg.dependencies); + var depsOutdated = false; + var depsMissing = false; + winston.verbose('Checking dependencies for outdated modules'); async.every(modules, function(module, next) { diff --git a/src/meta/errors.js b/src/meta/errors.js index 9c8d1ff772..80a32fab44 100644 --- a/src/meta/errors.js +++ b/src/meta/errors.js @@ -1,11 +1,9 @@ 'use strict'; -var async = require('async'), - winston = require('winston'), - validator = require('validator'); +var validator = require('validator'); -var db = require('../database'), - analytics = require('../analytics'); +var db = require('../database'); +var analytics = require('../analytics'); module.exports = function(Meta) { @@ -19,7 +17,7 @@ module.exports = function(Meta) { }; Meta.errors.get = function(escape, callback) { - db.getSortedSetRevRangeByScoreWithScores('errors:404', 0, -1, '+inf', '-inf', function(err, data) { + db.getSortedSetRevRangeWithScores('errors:404', 0, -1, function(err, data) { if (err) { return callback(err); } diff --git a/src/meta/js.js b/src/meta/js.js index e729937559..33a51a4ab1 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -1,15 +1,15 @@ 'use strict'; -var winston = require('winston'), - fork = require('child_process').fork, - path = require('path'), - async = require('async'), - nconf = require('nconf'), - fs = require('fs'), - file = require('../file'), - plugins = require('../plugins'), - emitter = require('../emitter'), - utils = require('../../public/src/utils'); +var winston = require('winston'); +var fork = require('child_process').fork; +var path = require('path'); +var async = require('async'); +var nconf = require('nconf'); +var fs = require('fs'); +var file = require('../file'); +var plugins = require('../plugins'); +var emitter = require('../emitter'); +var utils = require('../../public/src/utils'); module.exports = function(Meta) { diff --git a/src/meta/logs.js b/src/meta/logs.js index 0b38b61a34..4e99406175 100644 --- a/src/meta/logs.js +++ b/src/meta/logs.js @@ -1,8 +1,8 @@ 'use strict'; -var path = require('path'), - fs = require('fs'), - winston = require('winston'); +var path = require('path'); +var fs = require('fs'); +var winston = require('winston'); module.exports = function(Meta) { diff --git a/src/meta/settings.js b/src/meta/settings.js index 4fba3fcb2e..5604800f6d 100644 --- a/src/meta/settings.js +++ b/src/meta/settings.js @@ -1,7 +1,7 @@ 'use strict'; -var db = require('../database'), - plugins = require('../plugins'); +var db = require('../database'); +var plugins = require('../plugins'); module.exports = function(Meta) { diff --git a/src/meta/sounds.js b/src/meta/sounds.js index 9a73942773..7e901c69c7 100644 --- a/src/meta/sounds.js +++ b/src/meta/sounds.js @@ -8,7 +8,6 @@ var rimraf = require('rimraf'); var mkdirp = require('mkdirp'); var async = require('async'); -var user = require('../user'); var plugins = require('../plugins'); var db = require('../database'); @@ -60,6 +59,7 @@ module.exports = function(Meta) { }; Meta.sounds.getMapping = function(uid, callback) { + var user = require('../user'); async.parallel({ defaultMapping: function(next) { db.getObject('settings:sounds', next); diff --git a/src/meta/tags.js b/src/meta/tags.js index 15b2135b21..1b0f0cfd52 100644 --- a/src/meta/tags.js +++ b/src/meta/tags.js @@ -1,10 +1,10 @@ 'use strict'; -var nconf = require('nconf'), - validator = require('validator'), - async = require('async'), - winston = require('winston'), - plugins = require('../plugins'); +var nconf = require('nconf'); +var validator = require('validator'); +var async = require('async'); +var winston = require('winston'); +var plugins = require('../plugins'); module.exports = function(Meta) { Meta.tags = {}; diff --git a/src/meta/templates.js b/src/meta/templates.js index 88578b235e..d1d1ef7fab 100644 --- a/src/meta/templates.js +++ b/src/meta/templates.js @@ -1,19 +1,19 @@ "use strict"; -var mkdirp = require('mkdirp'), - rimraf = require('rimraf'), - winston = require('winston'), - async = require('async'), - path = require('path'), - fs = require('fs'), - nconf = require('nconf'), - - emitter = require('../emitter'), - plugins = require('../plugins'), - utils = require('../../public/src/utils'), - - Templates = {}, - searchIndex = {}; +var mkdirp = require('mkdirp'); +var rimraf = require('rimraf'); +var winston = require('winston'); +var async = require('async'); +var path = require('path'); +var fs = require('fs'); +var nconf = require('nconf'); + +var emitter = require('../emitter'); +var plugins = require('../plugins'); +var utils = require('../../public/src/utils'); + +var Templates = {}; +var searchIndex = {}; Templates.compile = function(callback) { callback = callback || function() {}; diff --git a/src/meta/themes.js b/src/meta/themes.js index dd93a206c2..27cbdc92e7 100644 --- a/src/meta/themes.js +++ b/src/meta/themes.js @@ -1,15 +1,14 @@ 'use strict'; -var nconf = require('nconf'), - winston = require('winston'), - fs = require('fs'), - path = require('path'), - async = require('async'), +var nconf = require('nconf'); +var winston = require('winston'); +var fs = require('fs'); +var path = require('path'); +var async = require('async'); - file = require('../file'), - db = require('../database'), - meta = require('../meta'); +var file = require('../file'); +var db = require('../database'); module.exports = function(Meta) { Meta.themes = {}; @@ -81,7 +80,7 @@ module.exports = function(Meta) { switch(data.type) { case 'local': async.waterfall([ - async.apply(meta.configs.get, 'theme:id'), + async.apply(Meta.configs.get, 'theme:id'), function(current, next) { async.series([ async.apply(db.sortedSetRemove, 'plugins:active', current), diff --git a/src/posts/cache.js b/src/posts/cache.js index 592d313f48..62277c46e3 100644 --- a/src/posts/cache.js +++ b/src/posts/cache.js @@ -1,11 +1,10 @@ var LRU = require('lru-cache'); +var meta = require('../meta'); var cache = LRU({ - max: 1048576, + max: parseInt(meta.config.postCacheSize, 10) || 1048576, length: function (n) { return n.length; }, maxAge: 1000 * 60 * 60 }); - - module.exports = cache; \ No newline at end of file diff --git a/src/views/admin/advanced/cache.tpl b/src/views/admin/advanced/cache.tpl index d8e3860367..bd01bf99e0 100644 --- a/src/views/admin/advanced/cache.tpl +++ b/src/views/admin/advanced/cache.tpl @@ -19,6 +19,10 @@ {postCache.percentFull}% Full +
+ + +
@@ -45,5 +49,18 @@ - +
+
+
Control Panel
+
+ +
+
+
+ + \ No newline at end of file