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

Added ?trace=2 support, to stringify trace output.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-05-25 10:47:10 -07:00
parent fba2ac227a
commit b24a30ace6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/scripts/meshcentral.js
View File

@ -10,7 +10,7 @@ var MeshServerCreateControl = function (domain, authCookie) {
obj.connectstate = 0; obj.connectstate = 0;
obj.pingTimer = null; obj.pingTimer = null;
obj.authCookie = authCookie; obj.authCookie = authCookie;
obj.trace = false; //obj.trace = false;
obj.xxStateChange = function (newstate, errCode) { obj.xxStateChange = function (newstate, errCode) {
if (obj.State == newstate) return; if (obj.State == newstate) return;
@ -48,13 +48,17 @@ var MeshServerCreateControl = function (domain, authCookie) {
if ((typeof message != 'object') || (message.action == 'pong')) { return; } if ((typeof message != 'object') || (message.action == 'pong')) { return; }
if (message.action == 'ping') { obj.send({ action: 'pong' }); } if (message.action == 'ping') { obj.send({ action: 'pong' }); }
if (message.action == 'close') { if (message.msg) { console.log(message.msg); } obj.Stop(message.cause); return; } if (message.action == 'close') { if (message.msg) { console.log(message.msg); } obj.Stop(message.cause); return; }
if (obj.trace) { console.log('RECV', message); } if (obj.trace == 1) { console.log('RECV', message); }
else if (obj.trace == 2) { console.log('RECV', JSON.stringify(message)); }
if (obj.onMessage) obj.onMessage(obj, message); if (obj.onMessage) obj.onMessage(obj, message);
}; };
obj.send = function (x) { obj.send = function (x) {
if (obj.socket != null && obj.connectstate == 1) { if (obj.socket != null && obj.connectstate == 1) {
if (obj.trace && (x.action != 'ping')) { console.log('SEND', x); } if (x.action != 'ping') {
if (obj.trace == 1) { console.log('SEND', x); }
else if (obj.trace == 2) { console.log('SEND', JSON.stringify(x)); }
}
obj.socket.send(JSON.stringify(x)); obj.socket.send(JSON.stringify(x));
} }
} }

2
views/default.handlebars
View File

@ -1471,7 +1471,7 @@
meshserver = MeshServerCreateControl(domainUrl, authCookie); meshserver = MeshServerCreateControl(domainUrl, authCookie);
meshserver.onStateChanged = onStateChanged; meshserver.onStateChanged = onStateChanged;
meshserver.onMessage = onMessage; meshserver.onMessage = onMessage;
meshserver.trace = (args.trace == 1); meshserver.trace = args.trace;
meshserver.Start(); meshserver.Start();
// Setup page controls // Setup page controls