You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2018/11/20 01:57:15 UTC
ignite git commit: IGNITE-10229 Web Console: Cleanup
ClusterLoginService on disconnect from cluster.
Repository: ignite
Updated Branches:
refs/heads/master a198b3ff5 -> 351d08075
IGNITE-10229 Web Console: Cleanup ClusterLoginService on disconnect from cluster.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/351d0807
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/351d0807
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/351d0807
Branch: refs/heads/master
Commit: 351d0807529a96aa524ae7d02b08f33587c501b6
Parents: a198b3f
Author: Alexander Kalinin <ve...@yandex.ru>
Authored: Tue Nov 20 08:57:13 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Nov 20 08:57:13 2018 +0700
----------------------------------------------------------------------
.../frontend/app/modules/agent/AgentManager.service.js | 11 ++++++++++-
.../modules/agent/components/cluster-login/service.js | 5 +++++
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/351d0807/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
index c59d6a1..dad625d 100644
--- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
@@ -30,6 +30,7 @@ import Worker from './decompress.worker';
import SimpleWorkerPool from '../../utils/SimpleWorkerPool';
import maskNull from 'app/core/utils/maskNull';
+import {CancellationError} from 'app/errors/CancellationError';
import {ClusterSecretsManager} from './types/ClusterSecretsManager';
import ClusterLoginService from './components/cluster-login/service';
@@ -379,11 +380,13 @@ export default class AgentManager {
case State.AGENT_DISCONNECTED:
this.agentModal.agentDisconnected(this.backText, this.backState);
+ this.ClusterLoginSrv.cancel();
break;
case State.CLUSTER_DISCONNECTED:
this.agentModal.clusterDisconnected(this.backText, this.backState);
+ this.ClusterLoginSrv.cancel();
break;
@@ -544,7 +547,13 @@ export default class AgentManager {
return {cluster, credentials: {}};
})
- .then(({cluster, credentials}) => this._executeOnActiveCluster(cluster, credentials, event, params));
+ .then(({cluster, credentials}) => this._executeOnActiveCluster(cluster, credentials, event, params))
+ .catch((err) => {
+ if (err instanceof CancellationError)
+ return;
+
+ return err;
+ });
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/351d0807/modules/web-console/frontend/app/modules/agent/components/cluster-login/service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/agent/components/cluster-login/service.js b/modules/web-console/frontend/app/modules/agent/components/cluster-login/service.js
index 955d0a3..406152d 100644
--- a/modules/web-console/frontend/app/modules/agent/components/cluster-login/service.js
+++ b/modules/web-console/frontend/app/modules/agent/components/cluster-login/service.js
@@ -77,4 +77,9 @@ export default class ClusterLoginService {
modal.hide();
});
}
+
+ cancel() {
+ if (this.deferred)
+ this.deferred.reject(new CancellationError());
+ }
}