proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-26 23:03:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui: join info: rework error handling/checking for no-cluster

Browse Source 
check if error is set before trying to access it and check for the
new HTTP code a newer pve-cluster may return, and do a more fuzzy
match for older ones.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-11-07 21:01:30 +01:00
parent 6152988ea6
commit 1b72acbf2f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/manager6/dc/Cluster.js
View File

@ -68,10 +68,12 @@ Ext.define('PVE.ClusterAdministration', {
let data = records?.[0]?.data; let data = records?.[0]?.data;
if (!success || !data || !data.nodelist?.length) { if (!success || !data || !data.nodelist?.length) {
let error = operation.getError(); let error = operation.getError();
if (error) {
let msg = Proxmox.Utils.getResponseErrorMessage(error); let msg = Proxmox.Utils.getResponseErrorMessage(error);
if (msg !== 'node is not in a cluster, no join info available! (500)') { if (error.status !== 424 && !msg.match(/node is not in a cluster/i)) {
// show the real message // an actual error, not just the "not in a cluster one", so show it!
Proxmox.Utils.setErrorMask(this.getView(), msg); Proxmox.Utils.setErrorMask(this.getView(), error);
}
} }
vm.set('totem', {}); vm.set('totem', {});
vm.set('isInCluster', false); vm.set('isInCluster', false);