separated setupMappings from ping

loopbackio · Apr 27, 2019 · 2f34d0e · 2f34d0e
1 parent 1efbad0
commit 2f34d0e
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/lib/esConnector.js b/lib/esConnector.js
@@ -126,25 +126,23 @@ ESConnector.prototype.connect = function (callback) {
  if (error) {
  console.log('ESConnector.prototype.connect', 'ping', 'failed', error);
  log('ESConnector.prototype.connect', 'ping', 'failed', error);
- callback(null, self.db);
- } else {
- if (self.settings.mappingProperties) {
- self.setupMappings()
- .then(function () {
- log('ESConnector.prototype.connect', 'setupMappings', 'finished');
- callback && callback(null, self.db);
- })
- .catch(function (err) {
- log('ESConnector.prototype.connect', 'setupMappings', 'failed', err);
- callback && callback(null, self.db);
- });
- } else {
- process.nextTick(function () {
- callback && callback(null, self.db);
- });
- }
  }
  });
+ if (self.settings.mappingProperties) {
+ self.setupMappings()
+ .then(function () {
+ log('ESConnector.prototype.connect', 'setupMappings', 'finished');
+ callback && callback(null, self.db);
+ })
+ .catch(function (err) {
+ log('ESConnector.prototype.connect', 'setupMappings', 'failed', err);
+ callback && callback(null, self.db);
+ });
+ } else {
+ process.nextTick(function () {
+ callback && callback(null, self.db);
+ });
+ }
  }
 };