Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
11 changes: 10 additions & 1 deletion lib/waterline.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ var buildDatastoreMap = require('./waterline/utils/system/datastore-builder');
var buildLiveWLModel = require('./waterline/utils/system/collection-builder');
var BaseMetaModel = require('./waterline/MetaModel');
var getModel = require('./waterline/utils/ontology/get-model');
var validateDatastoreConnectivity = require('./waterline/utils/system/validate-datastore-connectivity');




/**
Expand Down Expand Up @@ -711,7 +714,13 @@ function Waterline() {
});//</ each model identity >

// Call the `registerDatastore` adapter method.
datastore.adapter.registerDatastore(datastore.config, usedSchemas, next);
datastore.adapter.registerDatastore(datastore.config, usedSchemas, function(err) {
if (err) {
return next(err);
}

return validateDatastoreConnectivity(datastore, next);
});

} catch (err) { return next(err); }

Expand Down
48 changes: 48 additions & 0 deletions lib/waterline/utils/system/validate-datastore-connectivity.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
var _ = require('@sailshq/lodash');

/**
* validateDatastoreConnectivity()
*
* Validates connectivity to a datastore by trying to acquire and release
* connection.
*
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* @param {Ref} datastore
*
* @param {Function} done
* @param {Error?} err [if an error occured]
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*/

module.exports = function validateDatastoreConnectivity(datastore, done) {
var adapterDSEntry = _.get(datastore.adapter.datastores, datastore.config.identity);

// skip validation if `getConnection` and `releaseConnection` methods do not exist.
if (!(_.has(adapterDSEntry.driver, 'getConnection')
&& _.has(adapterDSEntry.driver, 'releaseConnection'))) {

return done();
}

// try to acquire connection.
adapterDSEntry.driver.getConnection({
manager: adapterDSEntry.manager
}, function getConnectionCb(err, conn) {
// fail if connection could not be acquired.
if (err) {
return done(err);
}

// release connection.
adapterDSEntry.driver.releaseConnection({
connection: conn.connection
}, function releaseConnectionCb(err) {
// fail if could not release connection.
if (err) {
return done(err);
}

return done();
});//</ definition of `releaseConnectionCb` >
});//</ definition of `getConnectionCb` >
};