Merge pull request #121 from bharathkontham/master

ElasticSearch connection error throw on initial ping is disabled

Author: bharathkontham

lib/esConnector.js

@@ -121,28 +121,28 @@ ESConnector.prototype.connect = function (callback) {
   } else {
     self.db = new elasticsearch.Client(self.getClientConfig());
     self.db.ping({
-      requestTimeout: 10000
+      requestTimeout: self.settings.requestTimeout
     }, function (error) {
       if (error) {
-        throw callback(error);
-      } 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);
-          });
-        }
+        console.log('ESConnector.prototype.connect', 'ping', 'failed', error);
+        log('ESConnector.prototype.connect', 'ping', 'failed', error);
       }
     });
+    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);
+      });
+    }
   }
 };
 
@@ -218,8 +218,9 @@ ESConnector.prototype.setupIndex = require('./setupIndex.js')({
  * @returns {String} with ping result
  */
 ESConnector.prototype.ping = function (cb) {
-  this.db.ping({
-    requestTimeout: 1000
+  var self = this;
+  self.db.ping({
+    requestTimeout: self.settings.requestTimeout
   }, function (error) {
     if (error) {
       log('Could not ping ES.');