Added reconnection on TokenSecurityException

orientechnologies · Sep 4, 2018 · 324169b · 324169b
1 parent e2f1ead
commit 324169b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/client/database/session.js b/lib/client/database/session.js
@@ -24,8 +24,11 @@ class SessionManager {
       return Promise.resolve(this.currentSession);
     }
 
+    if(this.opening){
+      return this.opening;
+    }
     this.client.logger.debug('opening database session to ' + this.name);
-    return this.client.cluster.acquireFrom()
+    this.opening = this.client.cluster.acquireFrom()
       .then((resource) => {
         let server = resource.server;
         let connection = resource.connection;
@@ -50,9 +53,11 @@ class SessionManager {
             });
           }).bind(this)
           .then(() => {
+            this.opening = null;
             return this.currentSession;
           });
       });
+      return this.opening;
   }
 
   current() {
@@ -164,7 +169,7 @@ class SessionManager {
         .then(resolve)
         .catch((err) => {
           // TODO Handle retry
-          if (err instanceof ConnectionError) {
+          if (err instanceof ConnectionError || err.isTokenException()) {
             this.currentSession = null;
             this.open().then(this.withSession.bind(this, op, data, acquire, cbk))
               .catch(reject);

diff --git a/lib/errors/request.js b/lib/errors/request.js
@@ -14,4 +14,11 @@ module.exports = OperationError.inherit(function RequestError(message, data) {
         "com.orientechnologies.orient.core.exception.OConcurrentModificationException"
     );
   };
+
+  this.isTokenException = () => {
+    return (
+      this.type ===
+      "com.orientechnologies.orient.enterprise.channel.binary.OTokenSecurityException"
+    );
+  };
 });