sync code

This commit is contained in:
Ned Wright
2026-01-03 18:59:01 +00:00
parent c1058db57d
commit 2105628f05
188 changed files with 8272 additions and 2723 deletions

View File

@@ -19,6 +19,7 @@
#include <sys/stat.h>
#include <boost/regex.hpp>
#include <boost/algorithm/string.hpp>
#include "i_messaging.h"
#include "config.h"
#include "debug.h"
@@ -64,19 +65,37 @@ AgentDetails::init()
writeAgentDetails();
}
previous_proxy = proxy;
registerConfigLoadCb(
[&]()
{
auto proxy_config = getProfileAgentSetting<string>("agent.config.message.proxy");
if (proxy_config.ok()) {
is_proxy_configured_via_settings = true;
setProxy(*proxy_config);
writeAgentDetails();
} else if (is_proxy_configured_via_settings) {
is_proxy_configured_via_settings = false;
setProxy(string(""));
writeAgentDetails();
auto load_env_proxy = loadProxy();
auto proxy_config = getProxy();
if (proxy != previous_proxy) {
dbgInfo(D_ORCHESTRATOR)
<< "Proxy configuration changed from '"
<< previous_proxy
<< "' to '"
<< proxy
<< "'";
auto messaging = Singleton::Consume<I_Messaging>::by<AgentDetails>();
messaging->clearConnections();
}
if (!proxy_config.ok() || proxy_config.unpack() == "none") {
auto proxy_config = getProfileAgentSetting<string>("agent.config.message.proxy");
if (proxy_config.ok()) {
is_proxy_configured_via_settings = true;
setProxy(*proxy_config);
writeAgentDetails();
} else if (is_proxy_configured_via_settings) {
is_proxy_configured_via_settings = false;
setProxy(string(""));
writeAgentDetails();
}
}
previous_proxy = proxy;
}
);

View File

@@ -5,6 +5,7 @@
#include "mock/mock_encryptor.h"
#include "mock/mock_shell_cmd.h"
#include "mock/mock_messaging.h"
#include "mock/mock_mainloop.h"
#include "cptest.h"
#include "config.h"
@@ -25,6 +26,7 @@ public:
::Environment env;
ConfigComponent conf;
StrictMock<MockMessaging> mock_messaging;
StrictMock<MockEncryptor> mock_encryptor;
StrictMock<MockShellCmd> mock_shell_cmd;
Config::I_Config *config = nullptr;