From 07bf075894b06faee6d26d306effc1b5733d9f0a Mon Sep 17 00:00:00 2001 From: azivner Date: Sun, 4 Mar 2018 21:33:06 -0500 Subject: [PATCH] cleaned up unused jobs implementation --- src/public/javascripts/server.js | 8 ------ src/routes/api/script.js | 6 ----- src/services/script.js | 46 -------------------------------- 3 files changed, 60 deletions(-) diff --git a/src/public/javascripts/server.js b/src/public/javascripts/server.js index b6f2e335b..4adbb3ee2 100644 --- a/src/public/javascripts/server.js +++ b/src/public/javascripts/server.js @@ -56,13 +56,6 @@ const server = (function() { return ret.executionResult; } - async function setJob(opts) { - opts.job = opts.job.toString(); - opts.params = prepareParams(opts.params); - - await post('script/job', opts); - } - let i = 1; const reqResolves = {}; @@ -127,7 +120,6 @@ const server = (function() { put, remove, exec, - setJob, ajax, // don't remove, used from CKEditor image upload! getHeaders diff --git a/src/routes/api/script.js b/src/routes/api/script.js index 7655c4deb..488789db1 100644 --- a/src/routes/api/script.js +++ b/src/routes/api/script.js @@ -16,12 +16,6 @@ router.post('/exec', auth.checkApiAuth, wrap(async (req, res, next) => { }); })); -router.post('/job', auth.checkApiAuth, wrap(async (req, res, next) => { - await script.setJob(req.body); - - res.send({}); -})); - router.get('/startup', auth.checkApiAuth, wrap(async (req, res, next) => { const repository = new Repository(req); const notes = await attributes.getNotesWithAttribute(repository, "run", "frontend_startup"); diff --git a/src/services/script.js b/src/services/script.js index 774cb925e..78261d868 100644 --- a/src/services/script.js +++ b/src/services/script.js @@ -34,51 +34,6 @@ async function execute(ctx, script, paramsStr) { return await (function() { return eval(`const api = this;\r\n(${script})(${paramsStr})`); }.call(ctx)); } -const timeouts = {}; -const intervals = {}; - -function clearExistingJob(name) { - if (timeouts[name]) { - clearTimeout(timeouts[name]); - - delete timeouts[name]; - } - - if (intervals[name]) { - clearInterval(intervals[name]); - - delete intervals[name]; - } -} - -async function executeJob(script, params, manualTransactionHandling) { - const ctx = new ScriptContext(); - const paramsStr = getParams(params); - - if (manualTransactionHandling) { - return await execute(ctx, script, paramsStr); - } - else { - return await sql.doInTransaction(async () => execute(ctx, script, paramsStr)); - } -} - -async function setJob(opts) { - const { name, runEveryMs, initialRunAfterMs } = opts; - - clearExistingJob(name); - - const jobFunc = () => executeJob(opts.job, opts.params, opts.manualTransactionHandling); - - if (runEveryMs && runEveryMs > 0) { - intervals[name] = setInterval(jobFunc, runEveryMs); - } - - if (initialRunAfterMs && initialRunAfterMs > 0) { - timeouts[name] = setTimeout(jobFunc, initialRunAfterMs); - } -} - function getParams(params) { if (!params) { return params; @@ -152,7 +107,6 @@ ${note.content} module.exports = { executeNote, executeScript, - setJob, getScriptBundle, getRenderScript }; \ No newline at end of file