summaryrefslogtreecommitdiff
path: root/js/codeq
diff options
context:
space:
mode:
authorAleš Smodiš <aless@guru.si>2015-12-15 16:58:13 +0100
committerAleš Smodiš <aless@guru.si>2015-12-15 16:58:13 +0100
commit2f1982456f85b156e152864b4d327c46a0adc4fe (patch)
treec5697ebd47d51e8b6880e69afae9f934f770fa0e /js/codeq
parent6d879afe4c423de9bdac9eeb6a8d3f8aa4526378 (diff)
Implement codeq.comms.forceReset() to better handle possible timeouts and resulting blockage in codeq.reset().
Diffstat (limited to 'js/codeq')
-rw-r--r--js/codeq/comms.js21
-rw-r--r--js/codeq/core.js7
2 files changed, 25 insertions, 3 deletions
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);
}