MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-16 16:23:25 +00:00
Code Issues Releases Wiki Activity

1. Added additional connection logging

Browse Source 
2. Updated Service Detection logic for auto-update
This commit is contained in:
Bryan Roe
2019-10-21 12:44:59 -07:00
parent 1ddbd8cb45
commit df5b57174a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meshcore/agentcore.c
View File

@@ -2894,14 +2894,14 @@ void MeshServer_ProcessCommand(ILibWebClient_StateObject WebStateObject, MeshAge
{ {
if (agent->logUpdate != 0) if (agent->logUpdate != 0)
{ {
ILIBLOGMESSSAGE("SelfUpdate -> Starting Diagnostic Agent, to assist with self update"); ILIBLOGMESSSAGE("SelfUpdate -> Starting Secondary Agent, to assist with self update");
} }
} }
else else
{ {
if (agent->logUpdate != 0) if (agent->logUpdate != 0)
{ {
ILIBLOGMESSSAGE("SelfUpdate -> Diagnostic Agent unavailable to assist with self update"); ILIBLOGMESSSAGE("SelfUpdate -> Secondary Agent unavailable to assist with self update");
} }
} }
@@ -3390,6 +3390,9 @@ void MeshServer_Connect(MeshAgentHostContainer *agent)
agent->fakeUpdate = ILibSimpleDataStore_Get(agent->masterDb, "fakeUpdate", NULL, 0); agent->fakeUpdate = ILibSimpleDataStore_Get(agent->masterDb, "fakeUpdate", NULL, 0);
agent->controlChannelDebug = ILibSimpleDataStore_Get(agent->masterDb, "controlChannelDebug", NULL, 0); agent->controlChannelDebug = ILibSimpleDataStore_Get(agent->masterDb, "controlChannelDebug", NULL, 0);
if (agent->logUpdate != 0) { ILIBLOGMESSAGEX("PLATFORM_TYPE: %d\n", agent->platformType); }
if (agent->logUpdate != 0) { ILIBLOGMESSAGEX("Running as Service: %d\n", agent->JSRunningAsService); }
if (agent->logUpdate != 0) { ILIBLOGMESSSAGE("Attempting to connect to Server..."); } if (agent->logUpdate != 0) { ILIBLOGMESSSAGE("Attempting to connect to Server..."); }
if (agent->controlChannelDebug != 0) if (agent->controlChannelDebug != 0)
{ {
@@ -3849,10 +3852,9 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **
} }
if (duk_peval_string(tmpCtx, "require('service-manager').manager.getService(process.platform=='win32'?'Mesh Agent':'meshagent').isMe();") == 0) if (duk_peval_string(tmpCtx, "require('service-manager').manager.getService(process.platform=='win32'?'Mesh Agent':'meshagent').isMe();") == 0)
{ {
agentHost->JSRunningAsService = duk_get_int(tmpCtx, -1); agentHost->JSRunningAsService = duk_get_boolean(tmpCtx, -1);
} }
#endif #endif
#if !defined(MICROSTACK_NOTLS) #if !defined(MICROSTACK_NOTLS)
// Check the local MacAddresses, to see if we need to reset our NodeId // Check the local MacAddresses, to see if we need to reset our NodeId
if (duk_peval_string(tmpCtx, "(function _getMac() { var ret = ''; var ni = require('os').networkInterfaces(); for (var f in ni) { for (var i in ni[f]) { if(ni[f][i].type == 'ethernet' || ni[f][i].type == 'wireless') {ret += ('[' + ni[f][i].mac + ']');} } } return(ret); })();") == 0) if (duk_peval_string(tmpCtx, "(function _getMac() { var ret = ''; var ni = require('os').networkInterfaces(); for (var f in ni) { for (var i in ni[f]) { if(ni[f][i].type == 'ethernet' || ni[f][i].type == 'wireless') {ret += ('[' + ni[f][i].mac + ']');} } } return(ret); })();") == 0)