4.3.0

Author: msavin

.DS_Store

@@ -13,10 +13,7 @@ const add = function () {
 		if (input.config && input.config.singular) {
 			const doc = Utilities.collection.findOne({
 				name: input.name,
-				arguments: input.arguments,
-				state: {
-					$in: ["pending", "failure"]
-				}
+				arguments: input.arguments
 			})
 
 			if (doc) blockAdd = true
@@ -26,7 +23,10 @@ const add = function () {
 		if (input.config && input.config.unique) {
 			const doc = Utilities.collection.findOne({
 				name: input.name,
-				arguments: input.arguments
+				arguments: input.arguments,
+				state: {
+					$in: ["pending", "failure"]
+				}
 			})
 
 			if (doc) blockAdd = true

package/server/imports/actions/add/index.js

@@ -7,8 +7,6 @@ const execute = async function (job, callback) {
 		message: "Job is not valid or not found, or is already resolved:"
 	});
 
-	console.log(`Jobs.execute`, jobDoc.name, jobDoc._id, jobDoc.due)
-
 	if (typeof jobDoc === "object") {
 		if (typeof Utilities.registry.data[jobDoc.name]) {			
 			const result = await process(jobDoc, callback);

package/server/imports/actions/execute/index.js

@@ -1,3 +1,4 @@
+import { Promise } from "meteor/promise"
 import { Utilities } from "../../utilities"
 import { toolbelt } from "./toolbelt.js"
 import { reschedule } from "../reschedule/"
@@ -9,51 +10,27 @@ const process = async function (doc, callback) {
 	// 3- Capture the result (if any)
 
 	const Toolbelt = new toolbelt(doc);
-	const jobFunc = Utilities.registry.data[doc.name];
-	const isAsync = jobFunc.constructor.name === "AsyncFunction";
 
-	if (isAsync) {
-		await jobFunc.apply(Toolbelt, doc.arguments)
-			.catch(function (error) {
-				const failure = Toolbelt.failure(error);
-				
-				Utilities.logger(`Job failed to run due to code error: ${doc.name}`)
-				console.log(error);
+	try {
+		const res = Utilities.registry.data[doc.name].apply(Toolbelt, doc.arguments);
+		const jobResult = Promise.await(Promise.resolve(res));
+		const resolution = Toolbelt.checkForResolution(jobResult);
 
-				if (typeof callback === "function") {
-					return callback(error, undefined);
-				}
-			})
-			.then(function (jobResult) {
-				const resolution = Toolbelt.checkForResolution(jobResult);
-
-				if (typeof callback === "function") {
-					return callback(undefined, jobResult);
-				} else {
-					return jobResult;
-				}
-			});
-	} else {
-		try {
-			const jobResult = jobFunc.apply(Toolbelt, doc.arguments);
-			const resolution = Toolbelt.checkForResolution(jobResult);
-
-			if (typeof callback === "function") {
-				return callback(undefined, jobResult);
-			} else {
-				return jobResult;
-			}
-		} catch (error) {		
-			const failure = Toolbelt.failure(error.stack);
-			
-			Utilities.logger(`Job failed to run due to code error: ${doc.name}`)
-			console.log(error);
-
-			if (typeof callback === "function") {
-				return callback(error, undefined);
-			}
+		if (typeof callback === "function") {
+			return callback(undefined, jobResult);
+		} else {
+			return jobResult;
+		}
+	} catch (error) {		
+		const failure = Toolbelt.failure(error.stack);
+		
+		Utilities.logger(`Job failed to run due to code error: ${doc.name}`)
+		console.log(error);
+
+		if (typeof callback === "function") {
+			return callback(error, undefined);
 		}
-	}	
+	}
 }
 
 export { process }

package/server/imports/actions/execute/process.js

@@ -1,7 +1,7 @@
 import { queue } from "../queue"
 import { Utilities } from "../../utilities/"
 
-let debugMode = true;
+let debugMode = false;
 
 const manager = {}
 
@@ -48,4 +48,4 @@ manager.isAvailable = function (name) {
 	return manager.queues[name].available;
 }
 
-export { manager, start, stop }
+export { manager }

package/server/imports/operator/manager/index.js

@@ -8,7 +8,7 @@ let debugMode = false;
 const queue = function (name, state = "failure") {
 	this.name = name;
 	this.state = "failure";
-	this.interval = null;
+	this.interval = false;
 	this.available = true;
 	this.previouslyRan = "this needs to be defined for the Mongo query :P";
 }

package/server/imports/operator/queue/index.js

@@ -8,13 +8,11 @@ import { Operator } from "../operator/"
 Meteor.startup(function () {
 	Utilities.start();
 	Operator.start();
-
-	Meteor.setTimeout(function () {
-		if (Utilities.config.autoStart) {
-			Meteor.setTimeout(function () {
-				console.log("=> Started jobs queue")
-				Operator.manager.start();
-			}, Utilities.config.startupDelay);
-		}
-	}, 3000)
+	
+	if (Utilities.config.autoStart) {
+		Operator.manager.start();
+		console.log("=> Started jobs queue")
+	} else {
+		console.log("=> Steve Jobs: auto start is disabled")
+	}
 });

package/server/imports/startup/index.js

@@ -6,7 +6,6 @@ const config = {
 	autoRetry: true,
 	started: false,
 	interval: 3000,
-	startupDelay: 1 * 1000,
 	maxWait: 5 * 60 * 1000,
 	disableDevelopmentMode: false,
 	remoteCollection: undefined,