Proxmox/novnc-pve
5
0
Fork 0
mirror of git://git.proxmox.com/git/novnc-pve.git synced 2024-12-22 17:34:20 +03:00
Code Releases Activity

Replace 'migrating' info strings with more generic 'connecting' messages

Browse Source 
This fixes the problem that a restarted container was seen as migrating
in the UI.

Background:
The check for migration happens on a 'disconnected' event, but can very well
come for other reasons, like entering reboot on the LXC console.
Since we have no idea about what have caused the disconnection, it is
better to display a more generic message.
This commit is contained in:
Emmanuel Kasper 2017-06-29 16:16:30 +02:00 committed by Dietmar Maurer
parent 3e9e694e97
commit f4aecc66a5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/patches/0001-add-pve-specific-js-code.patch vendored
View File

@ -191,7 +191,7 @@ index 0000000..668835a
+ if (migrating === undefined ||
+ migrating === true) {
+ // check (again) if migrating
+ me.UI.showStatus('Checking for Migration', 'warning', 5000);
+ me.UI.showStatus('Waiting for connection...', 'warning', 5000);
+ me.API2Request({
+ url: me.baseUrl + '/config',
+ method: 'GET',
@ -210,7 +210,7 @@ index 0000000..668835a
+ });
+ } else {
+ // not migrating any more
+ me.UI.showStatus('Migration finished', 'warning');
+ me.UI.showStatus('Connection resumed', 'warning');
+ clearInterval(check);
+ me.API2Request({
+ url: '/cluster/resources',