Merge 810d32f into faf2199

happner · Apr 20, 2018 · e17967f · e17967f
2 parents faf2199 + 810d32f
commit e17967f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,9 @@
 language: node_js
 
+branches:
+  only:
+    - master
+
 before_install:
 - if [[ `node -v` == v0* ]]; then npm i -g npm@3; fi
 - if [[ `node -v` != v0* && `npm -v` != 5* ]]; then npm i -g npm@5; fi

diff --git a/RELEASES.md b/RELEASES.md
@@ -483,3 +483,7 @@
 ----------------
 
 - use request@2.81.0 for Node 0.10 compatibility
+
+2.21.3 2018-04-18
+-----------------
+- Increase happn client login timeout to 60000.
diff --git a/lib/client/base.js b/lib/client/base.js
@@ -673,7 +673,7 @@
       options = {};//skip sending up the options
     } else message.options = options;
 
-    if (!options.timeout) options.timeout = 20000;//this is not used on the server side
+    if (!options.timeout) options.timeout = 50000;//this is not used on the server side
 
     message.protocol = PROTOCOL;
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "happn",
   "description": "pub/sub api as a service using primus and mongo & redis or nedb, can work as cluster, single process or embedded using nedb, use in production at your own risk",
-  "version": "2.21.2",
+  "version": "2.21.3",
   "main": "./lib/index",
   "protocol": "1.1.0",
   "scripts": {

diff --git a/test/c7_db_iterate.js b/test/c7_db_iterate.js
@@ -101,7 +101,7 @@ describe('c7_ds_iterate', function () {
   }
 
   before('it creates 2 test dss', function (callback) {
-    this.timeout(4000);
+    this.timeout(8000);
     getService(serviceConfig1, function (e, serviceInstance) {
       if (e) return callback(e);
       serviceInstance1 = serviceInstance;

diff --git a/test/e7-login-failures-reconnect.js b/test/e7-login-failures-reconnect.js
@@ -293,6 +293,7 @@ describe(require('path').basename(__filename), function () {
   });
 
   it('will not reconnect after shutdown', function () {
+    this.timeout(120000);
     var client;
 
     return Happn.client.create(