From 2f1982456f85b156e152864b4d327c46a0adc4fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Smodi=C5=A1?= <aless@guru.si>
Date: Tue, 15 Dec 2015 16:58:13 +0100
Subject: Implement codeq.comms.forceReset() to better handle possible timeouts
 and resulting blockage in codeq.reset().

---
 js/codeq/comms.js | 21 +++++++++++++++++++++
 js/codeq/core.js  |  7 ++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'js/codeq')

diff --git a/js/codeq/comms.js b/js/codeq/comms.js
index e964f20..5e046b7 100644
--- a/js/codeq/comms.js
+++ b/js/codeq/comms.js
@@ -557,6 +557,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
         'samlLogout': function(){
             return this.send({'action':'saml_logout'});
+        },
+
+        'forceReset': function () {
+            var p;
+            if (sid !== null) {
+                p = Q.Promise(function (resolve, reject, notify) {
+                    var t = setTimeout(function () {
+                        t = null;
+                        resolve();
+                    }, 3000); // 3 seconds
+                    codeq.comms.logout().then(function () {
+                        if (t !== null) {
+                            clearTimeout(t);
+                            t = null;
+                            resolve();
+                        }
+                    });
+                });
+            }
+            else p = Q();
+            return p.fin(codeq.comms.disconnect);
         }
     };
 })();
diff --git a/js/codeq/core.js b/js/codeq/core.js
index 22f6a50..c3c657f 100644
--- a/js/codeq/core.js
+++ b/js/codeq/core.js
@@ -610,15 +610,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
             codeq.log.info('App reset: ' + (reason || 'no reason given'));
             codeq.globalStateMachine.transition('login');
             codeq.wait(
-                    codeq.comms.getSid() == null ? Q() : codeq.comms.logout()
+/*                    codeq.comms.getSid() == null ? Q() : codeq.comms.logout()
                             .finally(
                                 codeq.comms.disconnect
                             )
                             .fail(function (e) {
                                 codeq.log.debug(e)
-                            }) // ignore errors
+                            }) // ignore errors*/
+                    codeq.comms.forceReset
                 )
-                .then(function () {
+                .fin(function () {
                     if (reason) {
                         alert(reason);
                     }
-- 
cgit v1.2.1