github_mirrors/openappsec
3
0
Fork 1
mirror of https://github.com/openappsec/openappsec.git synced 2025-06-28 16:41:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

configuration loading changes

Browse Source
This commit is contained in:
Ned Wright 2024-04-04 17:11:06 +00:00
parent b3de81d9d9
commit 98639d9cb6
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/config/config.cc
View File

@ -243,7 +243,7 @@ private:
dbgTrace(D_CONFIG) << "File system path reloaded: " << config_directory_path; dbgTrace(D_CONFIG) << "File system path reloaded: " << config_directory_path;
} }
void bool
sendOrchestatorReloadStatusMsg(const LoadNewConfigurationStatus &status) sendOrchestatorReloadStatusMsg(const LoadNewConfigurationStatus &status)
{ {
I_Messaging *messaging = Singleton::Consume<I_Messaging>::by<ConfigComponent>(); I_Messaging *messaging = Singleton::Consume<I_Messaging>::by<ConfigComponent>();
@ -261,7 +261,7 @@ private:
MessageMetadata secondary_port_req_md("127.0.0.1", 7778); MessageMetadata secondary_port_req_md("127.0.0.1", 7778);
secondary_port_req_md.setConnectioFlag(MessageConnectionConfig::ONE_TIME_CONN); secondary_port_req_md.setConnectioFlag(MessageConnectionConfig::ONE_TIME_CONN);
secondary_port_req_md.setConnectioFlag(MessageConnectionConfig::UNSECURE_CONN); secondary_port_req_md.setConnectioFlag(MessageConnectionConfig::UNSECURE_CONN);
messaging->sendSyncMessageWithoutResponse( service_config_status = messaging->sendSyncMessageWithoutResponse(
HTTPMethod::POST, HTTPMethod::POST,
"/set-reconf-status", "/set-reconf-status",
status, status,
@ -269,6 +269,11 @@ private:
secondary_port_req_md secondary_port_req_md
); );
} }
if (!service_config_status) {
dbgWarning(D_CONFIG) << "Unsuccessful attempt to send configuration reload status";
return false;
}
return true;
} }
unordered_map<TenantProfilePair, map<vector<string>, PerContextValue>> configuration_nodes; unordered_map<TenantProfilePair, map<vector<string>, PerContextValue>> configuration_nodes;
@ -932,7 +937,15 @@ ConfigComponent::Impl::reloadConfigurationContinuesWrapper(const string &version
mainloop->stop(routine_id); mainloop->stop(routine_id);
LoadNewConfigurationStatus finished(id, service_name, !res, true); LoadNewConfigurationStatus finished(id, service_name, !res, true);
if (!res) finished.setError("Failed to reload configuration"); if (!res) finished.setError("Failed to reload configuration");
sendOrchestatorReloadStatusMsg(finished); I_TimeGet *time = Singleton::Consume<I_TimeGet>::by<ConfigComponent>();
auto send_status_time_out = time->getMonotonicTime() + chrono::seconds(180);
while (time->getMonotonicTime() < send_status_time_out) {
if (sendOrchestatorReloadStatusMsg(finished)) break;
mainloop->yield(chrono::seconds(1));
}
if (time->getMonotonicTime() >= send_status_time_out) {
dbgWarning(D_CONFIG) << "Failed to send configuration reload status(finish) to the orchestrator";
}
is_continuous_report = false; is_continuous_report = false;
} }