From db3595d7666757218b68a30c60823bd2b89d788b Mon Sep 17 00:00:00 2001 From: fatchan Date: Mon, 16 Sep 2019 23:46:42 +0000 Subject: [PATCH] rename build --- helpers/{build.js => tasks.js} | 2 +- models/pages/banners.js | 2 +- models/pages/board.js | 2 +- models/pages/captchapage.js | 2 +- models/pages/catalog.js | 2 +- models/pages/changepassword.js | 2 +- models/pages/create.js | 2 +- models/pages/home.js | 2 +- models/pages/login.js | 2 +- models/pages/modlog.js | 2 +- models/pages/modloglist.js | 2 +- models/pages/news.js | 2 +- models/pages/register.js | 2 +- models/pages/thread.js | 2 +- schedules.js | 8 -------- worker.js | 2 +- 16 files changed, 15 insertions(+), 23 deletions(-) rename helpers/{build.js => tasks.js} (99%) diff --git a/helpers/build.js b/helpers/tasks.js similarity index 99% rename from helpers/build.js rename to helpers/tasks.js index c96ae631..38ec47f4 100644 --- a/helpers/build.js +++ b/helpers/tasks.js @@ -191,7 +191,6 @@ module.exports = { return html; }, -//TODO: move this elsewhere updateStats: async () => { const label = 'Hourly stats rollover'; const start = process.hrtime(); @@ -199,6 +198,7 @@ module.exports = { await Stats.resetStats(); const end = process.hrtime(start); console.log(timeDiffString(label, end)); + module.exports.buildHomepage(); }, buildChangePassword: () => { diff --git a/models/pages/banners.js b/models/pages/banners.js index eadb912f..627c7831 100644 --- a/models/pages/banners.js +++ b/models/pages/banners.js @@ -1,6 +1,6 @@ 'use strict'; -const { buildBanners } = require(__dirname+'/../../helpers/build.js'); +const { buildBanners } = require(__dirname+'/../../helpers/tasks.js'); module.exports = async (req, res, next) => { diff --git a/models/pages/board.js b/models/pages/board.js index 13d13240..aa267aae 100644 --- a/models/pages/board.js +++ b/models/pages/board.js @@ -1,7 +1,7 @@ 'use strict'; const Posts = require(__dirname+'/../../db/posts.js') - , { buildBoard } = require(__dirname+'/../../helpers/build.js'); + , { buildBoard } = require(__dirname+'/../../helpers/tasks.js'); module.exports = async (req, res, next) => { diff --git a/models/pages/captchapage.js b/models/pages/captchapage.js index 63ffaf3e..9bd0cc1a 100644 --- a/models/pages/captchapage.js +++ b/models/pages/captchapage.js @@ -1,6 +1,6 @@ 'use strict'; -const { buildCaptcha } = require(__dirname+'/../../helpers/build.js'); +const { buildCaptcha } = require(__dirname+'/../../helpers/tasks.js'); module.exports = async (req, res, next) => { diff --git a/models/pages/catalog.js b/models/pages/catalog.js index 51947120..96076e94 100644 --- a/models/pages/catalog.js +++ b/models/pages/catalog.js @@ -1,6 +1,6 @@ 'use strict'; -const { buildCatalog } = require(__dirname+'/../../helpers/build.js'); +const { buildCatalog } = require(__dirname+'/../../helpers/tasksd.js'); module.exports = async (req, res, next) => { diff --git a/models/pages/changepassword.js b/models/pages/changepassword.js index a55a49d4..51aa33aa 100644 --- a/models/pages/changepassword.js +++ b/models/pages/changepassword.js @@ -1,6 +1,6 @@ 'use strict'; -const { buildChangePassword } = require(__dirname+'/../../helpers/build.js'); +const { buildChangePassword } = require(__dirname+'/../../helpers/tasks.js'); module.exports = async (req, res, next) => { diff --git a/models/pages/create.js b/models/pages/create.js index 61be3ade..8cfe4700 100644 --- a/models/pages/create.js +++ b/models/pages/create.js @@ -1,6 +1,6 @@ 'use strict'; -const { buildCreate } = require(__dirname+'/../../helpers/build.js'); +const { buildCreate } = require(__dirname+'/../../helpers/tasks.js'); module.exports = async (req, res, next) => { diff --git a/models/pages/home.js b/models/pages/home.js index 882acb14..00b36954 100644 --- a/models/pages/home.js +++ b/models/pages/home.js @@ -1,6 +1,6 @@ 'use strict'; -const { buildHomepage } = require(__dirname+'/../../helpers/build.js'); +const { buildHomepage } = require(__dirname+'/../../helpers/tasks.js'); module.exports = async (req, res, next) => { diff --git a/models/pages/login.js b/models/pages/login.js index 66792cff..ed6acb1a 100644 --- a/models/pages/login.js +++ b/models/pages/login.js @@ -1,6 +1,6 @@ 'use strict'; -const { buildLogin } = require(__dirname+'/../../helpers/build.js') +const { buildLogin } = require(__dirname+'/../../helpers/tasks.js') , uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js'); module.exports = async (req, res, next) => { diff --git a/models/pages/modlog.js b/models/pages/modlog.js index 0694ba15..c63e9d9f 100644 --- a/models/pages/modlog.js +++ b/models/pages/modlog.js @@ -1,7 +1,7 @@ 'use strict'; const { Modlogs } = require(__dirname+'/../../db/') - , { buildModLog } = require(__dirname+'/../../helpers/build.js'); + , { buildModLog } = require(__dirname+'/../../helpers/tasks.js'); module.exports = async (req, res, next) => { diff --git a/models/pages/modloglist.js b/models/pages/modloglist.js index 0b32d3ca..0c3dc3ad 100644 --- a/models/pages/modloglist.js +++ b/models/pages/modloglist.js @@ -1,6 +1,6 @@ 'use strict'; -const { buildModLogList } = require(__dirname+'/../../helpers/build.js'); +const { buildModLogList } = require(__dirname+'/../../helpers/tasks.js'); module.exports = async (req, res, next) => { diff --git a/models/pages/news.js b/models/pages/news.js index 71ffd4b0..93c80748 100644 --- a/models/pages/news.js +++ b/models/pages/news.js @@ -1,6 +1,6 @@ 'use strict'; -const { buildNews } = require(__dirname+'/../../helpers/build.js'); +const { buildNews } = require(__dirname+'/../../helpers/tasks.js'); module.exports = async (req, res, next) => { diff --git a/models/pages/register.js b/models/pages/register.js index c5c4ac0f..ce989004 100644 --- a/models/pages/register.js +++ b/models/pages/register.js @@ -1,6 +1,6 @@ 'use strict'; -const { buildRegister } = require(__dirname+'/../../helpers/build.js'); +const { buildRegister } = require(__dirname+'/../../helpers/tasks.js'); module.exports = async (req, res, next) => { diff --git a/models/pages/thread.js b/models/pages/thread.js index 4ee9753d..817e31d4 100644 --- a/models/pages/thread.js +++ b/models/pages/thread.js @@ -1,6 +1,6 @@ 'use strict'; -const { buildThread } = require(__dirname+'/../../helpers/build.js'); +const { buildThread } = require(__dirname+'/../../helpers/tasks.js'); module.exports = async (req, res, next) => { diff --git a/schedules.js b/schedules.js index a84c6efd..985cdb99 100644 --- a/schedules.js +++ b/schedules.js @@ -30,14 +30,6 @@ const msTime = require(__dirname+'/helpers/mstime.js') //update board stats and homepage const taskQueue = require(__dirname+'/queue.js'); - taskQueue.push({ - 'task': 'buildHomepage', - 'options': {} - }, { - 'repeat': { - 'cron': '*/10 * * * *' - } - }); taskQueue.push({ 'task': 'updateStats', 'options': {} diff --git a/worker.js b/worker.js index b2b4f011..ec573f2d 100644 --- a/worker.js +++ b/worker.js @@ -13,7 +13,7 @@ const Queue = require('bull') console.log('CONNECTING TO MONGODB'); await Mongo.connect(); - const buildTasks = require(__dirname+'/helpers/build.js') + const buildTasks = require(__dirname+'/helpers/tasks.js') , generateQueue = new Queue('generate', { 'redis': configs.redis }); generateQueue