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
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
45 changes: 45 additions & 0 deletions lib/waterline/utils/system/validate-datastore-connectivity.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
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.
// aka pretend everything is OK
if (!_.has(adapterDSEntry.driver, 'getConnection') || !_.has(adapterDSEntry.driver, 'releaseConnection')) {
return done();
}

// try to acquire connection.
adapterDSEntry.driver.getConnection({
manager: adapterDSEntry.manager
}, function(err, report) {
if (err) {
return done(err);
}

// release connection.
adapterDSEntry.driver.releaseConnection({
connection: report.connection
}, function(err) {
if (err) {
return done(err);
}

return done();
});//</ releaseConnection() >
});//</ getConnection() >
};