Merge pull request #859 from strongloop/fix/err-msg-on-connector-error

Improve error message on connector init error
This commit is contained in:
Miroslav Bajtoš 2016-03-02 12:16:28 +01:00
commit ac94c2b988
1 changed files with 16 additions and 7 deletions

View File

@ -327,13 +327,22 @@ DataSource.prototype.setup = function (name, settings) {
}.bind(this);
if ('function' === typeof connector.initialize) {
// Call the async initialize method
connector.initialize(this, postInit);
} else if ('function' === typeof connector) {
// Use the connector constructor directly
this.connector = new connector(this.settings);
postInit();
try {
if ('function' === typeof connector.initialize) {
// Call the async initialize method
connector.initialize(this, postInit);
} else if ('function' === typeof connector) {
// Use the connector constructor directly
this.connector = new connector(this.settings);
postInit();
}
} catch(err) {
if (err.message) {
err.message = 'Cannot initialize connector ' +
JSON.stringify(connector.name || name) + ': ' +
err.message;
}
throw err;
}
}