Await createIndexAsync

Author: harryadel

server/imports/operator/dominator/index.js

@@ -26,7 +26,7 @@ const dominator = {
 
 let debugMode = false;
 
-dominator.initialize = function () {
+dominator.initialize = async function () {
 	if (debugMode) console.log("dominator.initialize", this)
 
 	const self = this;
@@ -43,12 +43,8 @@ dominator.initialize = function () {
 	}
 
 	// Then, ensure an index is set
-
-	if (self.collection.createIndex) {
-		self.collection.createIndexAsync({serverId: 1}, {unique: 1});
-	} else {
-		self.collection._ensureIndex({serverId: 1}, {unique: 1});
-	}
+	await self.collection.createIndexAsync({serverId: 1}, {unique: 1});
+	
 
 	// Finally, set the serverId
 	self.serverId = Utilities.config.getServerId();

server/imports/operator/index.js

@@ -4,8 +4,8 @@ import { manager } from "./manager/"
 
 const Operator = { dominator, queue, manager }
 
-Operator.start = function () {
-	Operator.dominator.initialize();
+Operator.start = async function () {
+	await Operator.dominator.initialize();
 }
 
 export { Operator }

server/imports/startup/index.js

@@ -5,8 +5,8 @@ import { Operator } from "../operator/"
 // 1. Wait 3 seconds for all the code to initialize
 // 2. Start Jobs if autoStart is enabled
 
-Meteor.startup(function () {
-	Utilities.start();
+Meteor.startup(async function() {
+	await Utilities.start();
 	Operator.start();
 
 	if (Utilities.config.autoStart) {

server/imports/utilities/collection/index.js

@@ -3,17 +3,15 @@ import { config } from "../config"
 
 let collection; 
 
-const initializeCollection = function () {
+const initializeCollection = async function () {
 	if (config.remoteCollection) {
 		const dbDriver = new MongoInternals.RemoteCollectionDriver(config.remoteCollection);
 		collection = new Mongo.Collection(config.collectionName, { _driver: dbDriver });
 	} else {
 		collection = new Mongo.Collection(config.collectionName);
 	}
 
-	if (collection.createIndexAsync) {
-		collection.createIndexAsync({ due: 1, state: 1 });
-	}
+	await collection.createIndexAsync({ due: 1, state: 1 });
 
 	return collection;
 }

server/imports/utilities/index.js

@@ -6,8 +6,8 @@ import { initializeCollection } from "./collection"
 
 const Utilities = { config, logger, helpers, registry }
 
-Utilities.start = function () {
-	Utilities.collection = initializeCollection();
+Utilities.start = async function () {
+	Utilities.collection = await initializeCollection();
 	Utilities.config.started = true;
 }