Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.

rocketchat:cors
rocketchat:mongo-config
rocketchat:cors

[email protected]
[email protected]
Expand Down
12 changes: 2 additions & 10 deletions packages/rocketchat-mongo-config/server/index.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
import { Mongo } from 'meteor/mongo';

// Revert change from Meteor 1.6.1 who set ignoreUndefined: true
// more information https://github.com/meteor/meteor/pull/9444
let mongoOptions = {
ignoreUndefined: false,
};

const mongoOptionStr = process.env.MONGO_OPTIONS;
if (typeof mongoOptionStr !== 'undefined') {
const jsonMongoOptions = JSON.parse(mongoOptionStr);
const mongoOptions = JSON.parse(mongoOptionStr);

mongoOptions = Object.assign({}, mongoOptions, jsonMongoOptions);
Mongo.setConnectionOptions(mongoOptions);
}

Mongo.setConnectionOptions(mongoOptions);