Push latest changes

Author: harryadel

server/api.js

@@ -188,7 +188,7 @@ Jobs.execute = async function (jobId, callback, force) {
 	// 3. Ensure the job is real
 
 	if (Operator.manager.isAvailable(doc.name) || force) {
-		return Actions.execute(doc, callback, force)
+		return await Actions.execute(doc, callback, force)
 	} else {
 		Utilities.logger("Unable to execute job -  queue is busy: " + doc.name + "/" + jobId);
 		return false;

server/imports/operator/manager/index.js

@@ -14,7 +14,7 @@ manager.add = function (name) {
 	manager.queues[name] = new queue(name, state)
 }
 
-manager.start = async function (name) {
+manager.start = function (name) {
 	if (debugMode) console.log(`Jobs: manager.start(${name})`)
 
 	const action = (queue) => manager.queues[queue].start()

server/imports/operator/queue/index.js

@@ -68,7 +68,7 @@ queue.prototype.grabDoc = async function () {
 	if (debugMode) console.log(`queue.prototype.grabDoc(${this.name})`)
 
 	const self = this;
-
+	
 	const jobDoc = await Utilities.collection.findOneAsync({
 		_id: {
 			$ne: self.previouslyRan
@@ -102,11 +102,11 @@ queue.prototype.grabDoc = async function () {
 	return jobDoc;
 }
 
-queue.prototype.run = function () {
+queue.prototype.run = async function () {
 	if (debugMode) console.log(`queue.prototype.run(${this.name})`)
 
 	const self = this;
-	const jobDoc = self.grabDoc();
+	const jobDoc = await self.grabDoc();
 
 	if (jobDoc) {
 		execute(jobDoc, function () {

server/imports/utilities/helpers/index.js

@@ -6,12 +6,12 @@ import { getJob } from "./getJob.js"
 import { processJobArguments } from "./processJobArguments.js"
 
 const helpers = {
-	generateDueDate: generateDueDate,
-	generateJobDoc: generateJobDoc,
-	getJob: getJob,
-	number: number,
-	date: date,
-	processJobArguments: processJobArguments
+	generateDueDate,
+	generateJobDoc,
+	getJob,
+	number,
+	date,
+	processJobArguments
 }
 
 export { helpers }

tests/basic.js

@@ -71,4 +71,5 @@ Tinytest.addAsync("Basic", async function (test) {
 	console.log("--- 6 ---")
 	var allJobDocs = await JobsInternal.Utilities.collection.find().fetchAsync();
 	console.log(allJobDocs);
+	test.equal(allJobDocs.length, 1)
 });

tests/internals.js

@@ -15,29 +15,31 @@ Tinytest.addAsync("Internals", async function (test) {
 
 	console.log("--- 0 ---")
 	var clear = await Jobs.clear("*")
-	console.log(clear)
 
 	// 1 - Register the Job
 
+	console.log("--- 1 ---")
 	Jobs.register({
 		"statefulJob": async function () {
 			self = this;
 
-			var count = self.get("count");
-			console.log(self)
+			let count = await self.get("count");
 			console.log("I am: " + count)
-			if (count < 5) {
 
+			if (count < 5) {
 				count = count + 1;
 				console.log("current is:" + count)
-				self.set("count", count)
-
-				self.reschedule({
+				await self.set("count", count)
+				
+				test.equal(self.document.data.count, count)
+				
+				await self.reschedule({
 					in: {
 						seconds: 5
 					}
 				})
 			} else {
+				test.equal(self.document.data.count, 5);
 				await self.remove()
 			}
 
@@ -46,11 +48,13 @@ Tinytest.addAsync("Internals", async function (test) {
 	})
 
 	// 2 - Schedule a job
-
-	var jobId = Jobs.run("statefulJob", {
+	console.log("--- 2 ---")
+	var jobId = await Jobs.run("statefulJob", {
 		data: {
 			count: 1
 		}
 	})
+	console.log("Job doc after run:")
+	console.log(jobId)
 
 });

tests/replication.js

@@ -18,8 +18,8 @@ Tinytest.addAsync("Replication", async function (test) {
 
 	// 1 - Register the Job
 
-	Jobs.register({
-		"timeThing": function () {
+	await Jobs.register({
+		"timeThing": async function () {
 			doc = this.document;
 
 			console.log("The current time is");
@@ -30,13 +30,13 @@ Tinytest.addAsync("Replication", async function (test) {
 
 			console.log("");
 
-			this.replicate({
+			await this.replicate({
 				in: {
 					seconds: 5
 				}
 			})
 
-			this.success();
+			await this.success();
 		}
 	})