Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improving mongoose->mongodb dependency chain requirement. #70

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Improving mongoose->mongodb dependency chain requirement. #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions lib/adapters/mongodb/sse/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const Hoek = require('hoek')
const Promise = require('bluebird')
const Rx = require('rx')
const RxNode = require('rx-node')
const mongo = require('mongoose/node_modules/mongodb')
const mongo = require('mongodb')
const mongoose = require('mongoose')
const Boom = require('boom')

Expand Down Expand Up @@ -189,7 +189,3 @@ module.exports = function (mongodbOplogUrl, options) {
}

}




6 changes: 3 additions & 3 deletions lib/utils/adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = function() {
const _checkValidAdapter = function(adapter, protocolFunctions) {

Hoek.assert(adapter, new Error('adapter missing'))

protocolFunctions.forEach((func) => {
Hoek.assert(adapter[func], new Error('Adapter validation failed. Adapter missing ' + func));
})
Expand All @@ -27,12 +27,12 @@ module.exports = function() {
try {
return require('../../lib/adapters/' + adapter);
} catch (err) {
Hoek.assert(!err, new Error('Wrong adapter name, see docs for built in adapter'))
Hoek.assert(!err, new Error('Unexpected error when loading adapter ' + adapter))
}
}

return adapter;
}

return { checkValidAdapter, checkValidAdapterSSE, getAdapter }
}
}
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"http-as-promised": "^1.1.0",
"joi": "^6.9.0",
"lodash": "^3.10.1",
"mongodb": "^2.1.7",
"mongoose": "^4.2.8",
"node-uuid": "^1.4.3",
"qs": "^6.0.0",
Expand Down