feat: other changes

wazuh · Nov 15, 2024 · d4d8005 · d4d8005
1 parent 39bb85a
commit d4d8005
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/src/agent/src/agent_registration.cpp b/src/agent/src/agent_registration.cpp
@@ -1,9 +1,11 @@
 #include <agent_registration.hpp>
 
 #include <boost/beast/http.hpp>
-#include <iostream>
+#include <config.h>
 #include <nlohmann/json.hpp>
 
+#include <iostream>
+
 namespace http = boost::beast::http;
 
 namespace agent_registration
@@ -16,7 +18,8 @@ namespace agent_registration
         , m_configurationParser(configFile.has_value() && !configFile->empty()
                                     ? configuration::ConfigurationParser(std::filesystem::path(configFile.value()))
                                     : configuration::ConfigurationParser())
-        , m_serverUrl(m_configurationParser.GetConfig<std::string>("agent", "registration_url"))
+        , m_serverUrl(m_configurationParser.GetConfig<std::string>("agent", "registration_url")
+                          .value_or(config::agent::DEFAULT_REGISTRATION_URL))
         , m_user(std::move(user))
         , m_password(std::move(password))
     {

diff --git a/src/modules/logcollector/src/file_reader.cpp b/src/modules/logcollector/src/file_reader.cpp
@@ -78,9 +78,9 @@ Localfile::Localfile(std::shared_ptr<std::istream> stream) :
     m_stream(std::move(stream)) { }
 
 std::string Localfile::NextLog() {
-    auto buffer = std::vector<char>(config::BUFFER_SIZE);
+    auto buffer = std::vector<char>(config::logcollector::BUFFER_SIZE);
 
-    if (m_stream->getline(buffer.data(), config::BUFFER_SIZE).good()) {
+    if (m_stream->getline(buffer.data(), config::logcollector::BUFFER_SIZE).good()) {
         m_pos = m_stream->tellg();
         return { buffer.data(), static_cast<size_t>(m_stream->gcount()) - 1 };
     } else {

diff --git a/src/modules/logcollector/src/file_reader.hpp b/src/modules/logcollector/src/file_reader.hpp
@@ -71,7 +71,7 @@ class FileReader : public IReader {
     /// @param pattern File pattern
     /// @param fileWait File wait time in milliseconds
     /// @param reloadInterval Reload interval in seconds
-    FileReader(Logcollector& logcollector, std::string pattern, long fileWait = config::DEFAULT_FILE_WAIT, long reloadInterval = config::DEFAULT_RELOAD_INTERVAL);
+    FileReader(Logcollector& logcollector, std::string pattern, long fileWait = config::logcollector::DEFAULT_FILE_WAIT, long reloadInterval = config::logcollector::DEFAULT_RELOAD_INTERVAL);
 
     /// @brief Runs the file reader
     /// @return Awaitable result

diff --git a/src/modules/logcollector/src/logcollector.cpp b/src/modules/logcollector/src/logcollector.cpp
@@ -1,8 +1,9 @@
 #include <logcollector.hpp>
-#include <logger.hpp>
 
+#include <logger.hpp>
 #include <boost/asio/co_spawn.hpp>
 #include <boost/asio/detached.hpp>
+#include <config.h>
 
 #include <chrono>
 #include <iomanip>
@@ -29,7 +30,7 @@ void Logcollector::EnqueueTask(boost::asio::awaitable<void> task) {
 
 void Logcollector::Setup(const configuration::ConfigurationParser& configurationParser) {
     try {
-        m_enabled = configurationParser.GetConfig<bool>("logcollector", "enabled");
+        m_enabled = configurationParser.GetConfig<bool>("logcollector", "enabled").value_or(config::logcollector::DEFAULT_ENABLED);
     } catch (std::exception&) {
         m_enabled = true;
     }
@@ -38,23 +39,23 @@ void Logcollector::Setup(const configuration::ConfigurationParser& configuration
 }
 
 void Logcollector::SetupFileReader(const configuration::ConfigurationParser& configurationParser) {
-    long fileWait = config::DEFAULT_FILE_WAIT;
-    long reloadInterval = config::DEFAULT_RELOAD_INTERVAL;
+    long fileWait = config::logcollector::DEFAULT_FILE_WAIT;
+    long reloadInterval = config::logcollector::DEFAULT_RELOAD_INTERVAL;
 
     try {
-        fileWait = configurationParser.GetConfig<long>("logcollector", "file_wait");
+        fileWait = configurationParser.GetConfig<long>("logcollector", "file_wait").value_or(config::logcollector::DEFAULT_FILE_WAIT);
     } catch (std::exception&) {
-        fileWait = config::DEFAULT_FILE_WAIT;
+        fileWait = config::logcollector::DEFAULT_FILE_WAIT;
     }
 
     try {
-        reloadInterval = configurationParser.GetConfig<long>("logcollector", "reload_interval");
+        reloadInterval = configurationParser.GetConfig<long>("logcollector", "reload_interval").value_or(config::logcollector::DEFAULT_RELOAD_INTERVAL);
     } catch (std::exception&) {
-        reloadInterval = config::DEFAULT_FILE_WAIT;
+        reloadInterval = config::logcollector::DEFAULT_FILE_WAIT;
     }
 
     try {
-        auto localfiles = configurationParser.GetConfig<std::vector<std::string>>("logcollector", "localfiles");
+        auto localfiles = configurationParser.GetConfig<std::vector<std::string>>("logcollector", "localfiles").value_or(std::vector<std::string>({config::logcollector::DEFAULT_LOCALFILES}));
 
         for (auto& lf : localfiles) {
             AddReader(std::make_shared<FileReader>(*this, lf, fileWait, reloadInterval));