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

MongoDB bulk get fix.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-01-10 14:41:25 -08:00
parent e9bd782418
commit cb8fc7d150
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db.js
View File

@ -1479,7 +1479,7 @@ module.exports.CreateDB = function (parent, func) {
} }
// If there are not results, send out a null callback // If there are not results, send out a null callback
for (var i in obj.filePendingGets) { for (var j in obj.filePendingGets[i]) { obj.filePendingGets[i][j](err, null); } } for (var i in obj.filePendingGets) { for (var j in obj.filePendingGets[i]) { obj.filePendingGets[i][j](err, []); } }
// Move on to process any more pending get operations // Move on to process any more pending get operations
obj.filePendingGets = obj.filePendingGet; obj.filePendingGets = obj.filePendingGet;

4
meshagent.js
View File

@ -1205,7 +1205,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
if (command.oldnodeid.length != 64) break; if (command.oldnodeid.length != 64) break;
const oldNodeKey = 'node//' + command.oldnodeid.toLowerCase(); const oldNodeKey = 'node//' + command.oldnodeid.toLowerCase();
db.Get(oldNodeKey, function (err, nodes) { db.Get(oldNodeKey, function (err, nodes) {
if ((nodes != null) && (nodes.length != 1)) return; if ((nodes == null) || (nodes.length != 1)) return;
const node = nodes[0]; const node = nodes[0];
if (node.meshid == obj.dbMeshKey) { if (node.meshid == obj.dbMeshKey) {
// Update the device name & host // Update the device name & host
@ -1283,7 +1283,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
if ((obj.agentInfo.capabilities & 0x40) != 0) { if ((obj.agentInfo.capabilities & 0x40) != 0) {
// Return nodeid of main agent + connection status // Return nodeid of main agent + connection status
db.Get('da' + obj.dbNodeKey, function (err, nodes) { db.Get('da' + obj.dbNodeKey, function (err, nodes) {
if (nodes.length == 1) { if ((nodes != null) && (nodes.length == 1)) {
obj.realNodeKey = nodes[0].raid; obj.realNodeKey = nodes[0].raid;
// Get agent connection state // Get agent connection state