MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #612 from Ylianst/revert-610-plugin 

Revert "Expand PluginHandler to Support Periodic Updates"
This commit is contained in:
Ylian Saint-Hilaire 2019-10-28 09:20:24 -07:00 committed by GitHub
parent 630c760d13 3e6514f567
commit 011651b349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agents/meshcore.js
View File

@ -2573,7 +2573,7 @@ function createMeshCore(agent) {
if ((meshCoreObj.av == null) || (JSON.stringify(meshCoreObj.av) != JSON.stringify(av))) { meshCoreObj.av = av; mesh.SendCommand(meshCoreObj); } if ((meshCoreObj.av == null) || (JSON.stringify(meshCoreObj.av) != JSON.stringify(av))) { meshCoreObj.av = av; mesh.SendCommand(meshCoreObj); }
} }
mesh.SendCommand({ action: "plugin", plugin: "__all", hook: "sendPeriodicServerUpdate"}); // TODO: add plugin hook here
} }

2
agents/meshcore.min.js vendored
View File

@ -2517,7 +2517,7 @@ function createMeshCore(agent) {
if ((meshCoreObj.av == null) || (JSON.stringify(meshCoreObj.av) != JSON.stringify(av))) { meshCoreObj.av = av; mesh.SendCommand(meshCoreObj); } if ((meshCoreObj.av == null) || (JSON.stringify(meshCoreObj.av) != JSON.stringify(av))) { meshCoreObj.av = av; mesh.SendCommand(meshCoreObj); }
} }
mesh.SendCommand({ action: "plugin", plugin: "__all", hook: "sendPeriodicServerUpdate"}); // TODO: add plugin hook here
} }

6
meshagent.js
View File

@ -1278,11 +1278,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
if (typeof command.plugin != 'string') break; if (typeof command.plugin != 'string') break;
try { try {
var pluginHandler = require('./pluginHandler.js').pluginHandler(parent.parent); var pluginHandler = require('./pluginHandler.js').pluginHandler(parent.parent);
if (command.plugin == '__all') { pluginHandler.plugins[command.plugin].serveraction(command, obj, parent);
pluginHandler.callHook(command.hook, command, obj, parent);
} else {
pluginHandler.plugins[command.plugin].serveraction(command, obj, parent);
}
} catch (e) { } catch (e) {
console.log('Error loading plugin handler (' + e + ')'); console.log('Error loading plugin handler (' + e + ')');
} }