From 7afbfa1816c789f513b93ba7889d1dbcfaf35d15 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Thu, 5 Mar 2020 14:28:32 +0200 Subject: [PATCH] Fixed no-op bulk writes --- .../api/creature/creatureComputation.js | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/app/imports/api/creature/creatureComputation.js b/app/imports/api/creature/creatureComputation.js index a9a350e8..836858db 100644 --- a/app/imports/api/creature/creatureComputation.js +++ b/app/imports/api/creature/creatureComputation.js @@ -8,7 +8,6 @@ import Creatures from "/imports/api/creature/Creatures.js"; import CreatureProperties from "/imports/api/creature/CreatureProperties.js"; import * as math from 'mathjs'; import parser from '/imports/parser/parser.js'; -if (Meteor.isClient) console.log({parser}); export const recomputeCreature = new ValidatedMethod({ @@ -19,7 +18,6 @@ export const recomputeCreature = new ValidatedMethod({ }).validator(), run({charId}) { - console.log(`recomputing ${charId}`) // Permission assertEditPermission(charId, this.userId); // Work, call this direcly if you are already in a method that has checked @@ -122,9 +120,10 @@ function writeAttributes(char) { } return op; }); + if (!bulkWriteOps.length) return; if (Meteor.isServer){ - CreatureProperties.rawCollection().bulkWrite(bulkWriteOps, {ordered : false}, function(e, r){ - if (e) console.warn(JSON.stringify(e, null, 2)); + let result = CreatureProperties.rawCollection().bulkWrite(bulkWriteOps, {ordered : false}, function(e, r){ + if (e) console.error(e); }); } else { _.each(bulkWriteOps, op => { @@ -145,9 +144,10 @@ function writeEffects(char){ }}, }, })); + if (!bulkWriteOps.length) return; if (Meteor.isServer){ - CreatureProperties.rawCollection().bulkWrite(bulkWriteOps, {ordered : false}, function(e, r){ - if (e) console.warn(JSON.stringify(e, null, 2)); + let result = CreatureProperties.rawCollection().bulkWrite(bulkWriteOps, {ordered : false}, function(e, r){ + if (e) console.error(e); }); } else { _.each(bulkWriteOps, op => { @@ -181,9 +181,10 @@ function writeSkills(char) { }; return op; }); + if (!bulkWriteOps.length) return; if (Meteor.isServer){ - CreatureProperties.rawCollection().bulkWrite( bulkWriteOps, {ordered : false}, function(e, r){ - if (e) console.warn(JSON.stringify(e, null, 2)); + let result = CreatureProperties.rawCollection().bulkWrite( bulkWriteOps, {ordered : false}, function(e, r){ + if (e) console.error(e); }); } else { _.each(bulkWriteOps, op => { @@ -213,9 +214,10 @@ function writeDamageMultipliers(char) { }; return op; }); + if (!bulkWriteOps.length) return; if (Meteor.isServer){ - CreatureProperties.rawCollection().bulkWrite( bulkWriteOps, {ordered : false}, function(e, r){ - if (e) console.warn(JSON.stringify(e, null, 2)); + let result = CreatureProperties.rawCollection().bulkWrite( bulkWriteOps, {ordered : false}, function(e, r){ + if (e) console.error(e); }); } else { _.each(bulkWriteOps, op => {