MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-01-24 13:13:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed IP-KVM port cleanup.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-12-07 19:45:00 -08:00
parent abf1c1ef1e
commit c80c1b5c98
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meshipkvm.js
View File

@ -200,7 +200,7 @@ function CreateIPKVMManager(parent) {
const kvmmanager = obj.managedGroups[kvmport.meshid]; const kvmmanager = obj.managedGroups[kvmport.meshid];
if (kvmmanager == null) return null; if (kvmmanager == null) return null;
urlargs.shift(); urlargs.shift();
var relurl = '/' + urlargs.join('/') var relurl = '/' + urlargs.join('/');
if (relurl.endsWith('/.websocket')) { relurl = relurl.substring(0, relurl.length - 11); } if (relurl.endsWith('/.websocket')) { relurl = relurl.substring(0, relurl.length - 11); }
return { domain: domain.id, relurl: relurl, preurl: q.path.substring(0, i + 76), nodeid: nodeid, nid: nid, kvmmanager: kvmmanager, kvmport: kvmport }; return { domain: domain.id, relurl: relurl, preurl: q.path.substring(0, i + 76), nodeid: nodeid, nid: nid, kvmmanager: kvmmanager, kvmport: kvmport };
} }
@ -549,7 +549,6 @@ function CreateRaritanKX3Manager(parent, hostname, port, username, password) {
delete kvmport.bytesIn; delete kvmport.bytesIn;
delete kvmport.bytesOut; delete kvmport.bytesOut;
delete kvmport.connectionStart; delete kvmport.connectionStart;
delete wsClient.kvmport;
delete wsClient.reqinfo; delete wsClient.reqinfo;
} }
@ -609,8 +608,14 @@ function CreateRaritanKX3Manager(parent, hostname, port, username, password) {
if (this.wsClient) { if (this.wsClient) {
logDisconnection(this.wsClient); logDisconnection(this.wsClient);
try { this.wsClient.close(); } catch (ex) { } try { this.wsClient.close(); } catch (ex) { }
if (this.wsClient.kvmport) { delete this.wsClient.kvmport.wsClient; delete this.wsClient.kvmport; } try {
delete this.wsClient.wsBrowser; delete this.wsClient; if (this.wsClient.kvmport) {
delete this.wsClient.kvmport.wsClient;
delete this.wsClient.kvmport;
}
delete this.wsClient.wsBrowser;
delete this.wsClient;
} catch (ex) { console.log(ex); }
} }
}); });
this.wsBrowser.on('error', function (err) { this.wsBrowser.on('error', function (err) {
@ -635,12 +640,14 @@ function CreateRaritanKX3Manager(parent, hostname, port, username, password) {
parent.parent.debug('relay', 'IPKVM: Relay websocket closed'); parent.parent.debug('relay', 'IPKVM: Relay websocket closed');
// Clean up // Clean up
try {
if (this.wsBrowser) { if (this.wsBrowser) {
logDisconnection(this.wsBrowser.wsClient); logDisconnection(this.wsBrowser.wsClient);
try { this.wsBrowser.close(); } catch (ex) { } try { this.wsBrowser.close(); } catch (ex) { }
delete this.wsBrowser.wsClient; delete this.wsBrowser; delete this.wsBrowser.wsClient; delete this.wsBrowser;
} }
if (this.kvmport) { delete this.kvmport.wsClient; delete this.kvmport; } if (this.kvmport) { delete this.kvmport.wsClient; delete this.kvmport; }
} catch (ex) { console.log(ex); }
}); });
reqinfo.kvmport.wsClient.on('error', function (err) { reqinfo.kvmport.wsClient.on('error', function (err) {
parent.parent.debug('relay', 'IPKVM: Relay websocket error: ' + err); parent.parent.debug('relay', 'IPKVM: Relay websocket error: ' + err);