Skip to content

Commit ee87f90

Browse files
committed
Option to do not output error on aggregation pipeline.
1 parent c7912ea commit ee87f90

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

bin/upgrade/24.10/scripts/merge_events_collections.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ async function merge_data_from_collection(countlyDB, collection, mapped, resolve
4646
var app_id = mapped[collection].a;
4747
var prefix = app_id + "_" + collection.replace("events", "");
4848
var tscheck = Date.now().valueOf();
49-
countlyDB.collection(collection).aggregate([{"$match": {"merged": {"$ne": true}}}, {"$addFields": {"_id": {"$concat": [prefix, "_", "$_id"]}, "tscheck": tscheck, "a": app_id, "e": mapped[collection].e}}, {"$merge": {"into": "events_data", "on": "_id", "whenMatched": "fail"}}], async function(err) {
49+
countlyDB.collection(collection).aggregate([{"$match": {"merged": {"$ne": true}}}, {"$addFields": {"_id": {"$concat": [prefix, "_", "$_id"]}, "tscheck": tscheck, "a": app_id, "e": mapped[collection].e}}, {"$merge": {"into": "events_data", "on": "_id", "whenMatched": "fail"}}], {ignore_errors: [11000]}, async function(err) {
5050
if (err) {
5151
console.log("Failed to merge with database $merge operation. Doing each document one by one");
5252

plugins/pluginManager.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -2569,10 +2569,12 @@ var pluginManager = function pluginManager() {
25692569
}
25702570
return function(err, res) {
25712571
if (err) {
2572-
logDbRead.e("Error reading " + collection + " %j %s %j", data, err, err);
2573-
logDbRead.d("From connection %j", countlyDb._cly_debug);
2574-
if (e) {
2575-
logDbRead.e(e.stack);
2572+
if (!(data && data.args && data.args[1] && data.args[1].ignore_errors && data.args[1].ignore_errors.indexOf(err.code) !== -1)) {
2573+
logDbRead.e("Error reading " + collection + " %j %s %j", data, err, err);
2574+
logDbRead.d("From connection %j", countlyDb._cly_debug);
2575+
if (e) {
2576+
logDbRead.e(e.stack);
2577+
}
25762578
}
25772579
}
25782580
if (callback) {

0 commit comments

Comments
 (0)