MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-02 17:35:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed server exception in MeshAgent.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2019-06-07 09:44:39 -07:00
parent f171100c1f
commit 4eb2510e2e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meshagent.js
View File

@ -696,11 +696,11 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
} }
} }
completeAgentConnection3(device); completeAgentConnection3(device, mesh);
}); });
} }
function completeAgentConnection2(device) { function completeAgentConnection2() {
// See if this mesh exists, if it does not we may want to create it. // See if this mesh exists, if it does not we may want to create it.
var mesh = getMeshAutoCreate(); var mesh = getMeshAutoCreate();
@ -736,10 +736,10 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
parent.parent.DispatchEvent(['*', obj.dbMeshKey], obj, { etype: 'node', action: 'addnode', node: device, msg: ('Added device ' + obj.agentInfo.computerName + ' to mesh ' + mesh.name), domain: domain.id }); parent.parent.DispatchEvent(['*', obj.dbMeshKey], obj, { etype: 'node', action: 'addnode', node: device, msg: ('Added device ' + obj.agentInfo.computerName + ' to mesh ' + mesh.name), domain: domain.id });
} }
completeAgentConnection3(device); completeAgentConnection3(device, mesh);
} }
function completeAgentConnection3(device) { function completeAgentConnection3(device, mesh) {
// Check if this agent is already connected // Check if this agent is already connected
const dupAgent = parent.wsagents[obj.dbNodeKey]; const dupAgent = parent.wsagents[obj.dbNodeKey];
parent.wsagents[obj.dbNodeKey] = obj; parent.wsagents[obj.dbNodeKey] = obj;

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.3.6-c", "version": "0.3.6-d",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",